单人战斗

FGUIProject/assets/DressUp/PhotographSaveUI.xml

@@ -14,7 +14,7 @@
       <relation target="n3_i3ix" sidePair="right-right,top-top"/>
     </component>
     <component id="n4_i3ix" name="btnSave" src="i3ix5a" fileName="components/Button12.xml" xy="647,1654" size="140,116" group="n9_uyux">
-      <Button icon="ui://mbo439wbuyuxdq"/>
+      <Button icon="ui://mbo439wbuyuxdq" selectedIcon="ui://mbo439wbwonods"/>
     </component>
     <component id="n5_i3ix" name="btnShare" src="i3ix5a" fileName="components/Button12.xml" xy="769,1654" group="n9_uyux" visible="false">
       <Button icon="ui://mbo439wbxmtl4v"/>
@@ -26,7 +26,7 @@
       <Button icon="ui://mbo439wbxmtl4u"/>
     </component>
     <component id="n11_uyux" name="btnSavePhoto" src="i3ix5a" fileName="components/Button12.xml" xy="807,1654" size="141,116" group="n9_uyux">
-      <Button icon="ui://mbo439wbuyuxdp"/>
+      <Button icon="ui://mbo439wbuyuxdp" selectedIcon="ui://mbo439wbwonodr"/>
     </component>
     <group id="n9_uyux" name="n9" xy="647,1654" size="301,116" advanced="true" layout="hz" colGap="20" excludeInvisibles="true">
       <relation target="n3_i3ix" sidePair="right-right,bottom-bottom"/>

FGUIProject/assets/DressUp/components/Button12.xml

@@ -4,6 +4,6 @@
   <displayList>
     <loader id="n3_i3ix" name="icon" xy="0,0" size="84,84" url="ui://mbo439wbxmtl4x" autoSize="true"/>
   </displayList>
-  <Button/>
+  <Button mode="Radio"/>
   <relation target="n3_i3ix" sidePair="width-width,height-height"/>
 </component>

FGUIProject/assets/DressUp/package.xml

@@ -159,6 +159,8 @@
     <image id="94m1do" name="hz_kuangk_2.png" path="/images/" exported="true"/>
     <image id="uyuxdp" name="pz_icon_6.png" path="/images/"/>
     <image id="uyuxdq" name="pz_icon_5.png" path="/images/"/>
+    <image id="wonodr" name="pz_icon_66.png" path="/images/"/>
+    <image id="wonods" name="pz_icon_55.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\DressUp" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Main/StoryFightResultUI.xml

@@ -1,29 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
-  <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
-    <component id="n2_8xpg" name="expBar" src="8xpg52" fileName="components/CompFightExpBar.xml" xy="33,1924">
-      <gearDisplay controller="c1" pages="0"/>
-      <relation target="" sidePair="center-center,bottom-bottom"/>
-    </component>
+    <loader id="n11_wono" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
+      <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
+    </loader>
     <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>
-    <loader id="n3_fvw9" name="bg" xy="8,-415" size="1064,402" group="n7_fvw9" visible="false" url="ui://mfvz4q8k8xpg4u" fill="scale"/>
-    <graph id="n4_fvw9" name="holder" xy="539,-215" size="1,1" group="n7_fvw9" type="rect"/>
-    <text id="n5_fvw9" name="txtScore" xy="703,-152" size="244,66" group="n7_fvw9" font="ui://mfvz4q8k8xpg4q" fontSize="38" color="#ffffff" autoClearText="true" text="99999">
-      <gearDisplay controller="c1" pages="0"/>
-      <relation target="n3_fvw9" sidePair="left-left,top-top"/>
-    </text>
-    <component id="n6_fvw9" name="flower" src="s2cc5o" fileName="components/CompFlower3.xml" xy="696,-86" group="n7_fvw9">
-      <gearDisplay controller="c1" pages="0"/>
+    <component id="n8_wono" name="comResult" src="wonogf" fileName="components/ComResult.xml" xy="815,0">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </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">
+      <relation target="" sidePair="center-center,bottom-bottom"/>
     </component>
-    <group id="n7_fvw9" name="grpTop" xy="8,-415" size="1064,402" advanced="true"/>
   </displayList>
-  <transition name="t0">
-    <item time="0" type="Alpha" target="n2_8xpg" tween="true" startValue="0" endValue="1" duration="6"/>
-    <item time="0" type="Alpha" target="n7_fvw9" tween="true" startValue="0" endValue="1" duration="6" ease="Quad.In"/>
-    <item time="0" type="XY" target="n2_8xpg" tween="true" startValue="33,2105" endValue="33,1665" duration="6" label2="posY" ease="Bounce.Out"/>
-    <item time="0" type="XY" target="n7_fvw9" tween="true" startValue="8,-415" endValue="8,47" duration="6" ease="Bounce.Out"/>
-  </transition>
 </component>

FGUIProject/assets/Main/StoryFightSingleScoreUI.xml

@@ -7,12 +7,15 @@
     <loader id="n38_wono" name="loaRole" xy="0,0" size="1080,1920">
       <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
-    <component id="n34_tc53" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,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 id="n34_tc53" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="34,60">
+      <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">
+      <relation target="" sidePair="top-top"/>
+      <ProgressBar max="100"/>
     </component>
-    <component id="n4_n0js" name="comClickCircle" src="n0js9b" fileName="components/comClickCircle.xml" xy="122,765" visible="false"/>
-    <component id="n31_cn27" name="comAllCircle" src="cn279k" fileName="components/ComAllCircle.xml" xy="382,1182" visible="false"/>
+    <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="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"/>
     <graph id="n24_uo1t" name="grh_2" xy="817,1303" pivot="0.5,0.5" size="25,25" aspect="true"/>
@@ -21,14 +24,20 @@
     <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="192,80">
-      <relation target="" sidePair="top-top"/>
-      <ProgressBar max="100"/>
-    </component>
     <component id="n36_jj0m" name="btnSpeedUp" src="jj0mdl" fileName="componentsDialog/ButtonSpeedUp1.xml" xy="915,1627">
       <relation target="" sidePair="right-right,bottom-bottom"/>
       <Button title="x1"/>
     </component>
-    <graph id="n37_wgy9" name="holderPartScore" xy="512,489" size="1,1" visible="false"/>
   </displayList>
+  <transition name="t1" options="2">
+    <item time="0" type="Alpha" target="n40_wono" value="0"/>
+    <item time="0" type="Rotation" target="n40_wono" value="0"/>
+    <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"/>
+  </transition>
 </component>

FGUIProject/assets/Main/components/ComHead.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="163,163" mask="n10_wono">
+  <displayList>
+    <image id="n12_wono" name="n12" src="kubi7e" fileName="images/self.png" xy="8,8">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <image id="n10_wono" name="n10" src="wonogj" fileName="imagesFight/zjm_txkuang_1.png" xy="13,13">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+  </displayList>
+</component>

FGUIProject/assets/Main/components/ComResult.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="265,601">
+  <controller name="c1" pages="0,,1,,2,,3," selected="3"/>
+  <displayList>
+    <loader id="n9_wono" name="logResult" xy="0,0" size="265,601" url="ui://mfvz4q8kwonoge" 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">
+      <gearDisplay controller="c1" pages="1,2,3"/>
+    </image>
+    <image id="n11_wono" name="n11" src="wonog7" fileName="imagesFight/zd_js_xing_1.png" xy="177,243" group="n13_wono">
+      <gearDisplay controller="c1" pages="2,3"/>
+    </image>
+    <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">
+      <gearColor controller="c1" pages="0" values="#ecf6fc,#749dc8" default="#ecf6fc,#c49a49"/>
+    </text>
+  </displayList>
+</component>

FGUIProject/assets/Main/components/ComRole.xml

@@ -0,0 +1,12 @@
+<?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">
+      <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>
+  </displayList>
+</component>

FGUIProject/assets/Main/components/ComRoleResult.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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">
+      <gearDisplay controller="c1" pages="1"/>
+    </image>
+    <image id="n13_wono" name="n13" src="wonog3" fileName="imagesFight/jz_sanjd_xs.png" xy="0,0">
+      <gearDisplay controller="c1" pages="2"/>
+    </image>
+    <image id="n10_wono" name="n10" src="wonog4" fileName="imagesFight/jz_sijd_xs.png" xy="0,0">
+      <gearDisplay controller="c1" pages="3"/>
+    </image>
+  </displayList>
+</component>

FGUIProject/assets/Main/components/ComScoreStage.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="106,62">
+  <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"/>
+  </displayList>
+</component>

FGUIProject/assets/Main/components/ComSingleScore.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="274,274">
+  <displayList>
+    <image id="n22_wono" name="n22" src="wonogn" fileName="imagesStory/zd_gxi_1.png" xy="0,0"/>
+    <text id="n24_wono" name="txtPart" xy="85,69" pivot="0.5,0" size="103,66" fontSize="50" color="#fcf3e2" strokeColor="#c49a49" strokeSize="2" text="上衣"/>
+    <text id="n23_wono" name="txtScore" xy="75,135" pivot="0.5,0" size="123,64" fontSize="48" color="#fcf3e2" strokeColor="#c49a49" strokeSize="2" text="1880"/>
+  </displayList>
+</component>

FGUIProject/assets/Main/components/CompFightExpBar.xml

@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1014,168">
+<component size="1080,247">
   <displayList>
-    <image id="n2_8xpg" name="n2" src="8xpg4r" fileName="imagesFight/zd_jsjm_ditu.png" xy="0,39"/>
-    <image id="n4_8xpg" name="n4" src="8xpg4y" fileName="imagesFight/zd_jsjm_jyz.png" xy="807,58"/>
-    <component id="n5_8xpg" name="iconHead" src="kubi7h" fileName="components/CompHeadWithBg.xml" xy="17,0" size="147,147"/>
-    <text id="n6_8xpg" name="n6" xy="179,68" size="52,34" fontSize="24" color="#fffcf7" text="等级"/>
-    <text id="n7_8xpg" name="txtLvl" xy="252,39" size="73,74" fontSize="56" color="#ffffff" autoClearText="true" text="99"/>
-    <text id="n8_8xpg" name="txtLvlAdded" xy="926,58" size="58,41" fontSize="30" color="#ffffff" leading="0" singleLine="true" text="+00"/>
-    <component id="n9_8xpg" name="pbExp" src="sd8cei" fileName="components/Component6.xml" xy="171,102"/>
+    <image id="n2_8xpg" name="n2" src="8xpg4r" fileName="imagesFight/zd_jsjm_ditu.png" xy="0,0"/>
+    <text id="n7_8xpg" name="txtLvl" xy="234,100" size="124,46" fontSize="34" color="#9b7a47" autoClearText="true" text="等级 99"/>
+    <text id="n8_8xpg" name="txtLvlAdded" xy="825,113" pivot="1,0" size="200,46" fontSize="34" color="#9b7a47" leading="0" singleLine="true" text="经验值：+20"/>
+    <component id="n9_8xpg" name="pbExp" src="sd8cei" fileName="components/Component6.xml" xy="221,157"/>
+    <component id="n10_wono" name="n10" src="wonogi" fileName="components/ComHead.xml" xy="36,54" size="165,165" aspect="true"/>
+    <image id="n13_wono" name="n13" src="wonogg" fileName="imagesFight/zjm_txkuang.png" xy="36,55"/>
   </displayList>
 </component>

FGUIProject/assets/Main/components/Component2.xml

@@ -4,7 +4,7 @@
     <component id="n1_uj53" name="bar" src="k1khe8" fileName="components/Component3.xml" xy="0,0">
       <relation target="" sidePair="width-width"/>
     </component>
-    <image id="n6_uj53" name="imgAni" src="k1khdp" fileName="imagesStory/zd_zdjdt_liang.png" xy="836,15" pivot="0.65,0.6" anchor="true">
+    <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">
       <relation target="" sidePair="right-right"/>
     </image>
     <graph id="n7_k1kh" name="holder" xy="835,11" pivot="0.5,0.5" size="1,1">

FGUIProject/assets/Main/components/Component3.xml

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

FGUIProject/assets/Main/components/Component5.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="815,20" overflow="hidden">
   <displayList>
-    <image id="n1_8xpg" name="bar" src="8xpg4s" fileName="imagesFight/zd_jsjm_jdt_2.png" xy="0,0" size="815,20"/>
+    <image id="n1_8xpg" name="bar" src="8xpg4s" fileName="imagesFight/zd_jsjm_jdt_2.png" xy="0,0"/>
   </displayList>
 </component>

FGUIProject/assets/Main/components/Component6.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="829,44">
   <displayList>
-    <image id="n4_8xpg" name="n4" src="8xpg51" fileName="imagesFight/zd_drpf_jdt_1.png" xy="0,11"/>
+    <image id="n4_8xpg" name="n4" src="wonogh" fileName="imagesFight/zd_drpf_jdt_1.png" xy="0,11"/>
     <component id="n1_8xpg" name="bar" src="sd8ceh" fileName="components/Component5.xml" xy="2,13"/>
-    <text id="n2_8xpg" name="title" xy="0,3" size="819,40" fontSize="26" color="#ffffff" align="center" vAlign="middle" autoSize="none" singleLine="true" text="">
+    <text id="n2_8xpg" name="title" xy="0,2" size="819,40" fontSize="24" color="#ffffff" align="center" vAlign="middle" autoSize="none" strokeColor="#daa551" strokeSize="2" singleLine="true" text="80/100">
       <relation target="" sidePair="width-width,height-height"/>
     </text>
-    <image id="n3_8xpg" name="n3" src="8xpg4t" fileName="imagesFight/zd_jsjm_jdt_3.png" xy="807,0">
+    <image id="n3_8xpg" name="n3" src="8xpg4t" fileName="imagesFight/zd_jsjm_jdt_3.png" xy="803,0">
       <relation target="n1_8xpg" sidePair="right-right"/>
     </image>
-    <graph id="n5_sd8c" name="holder" xy="818,22" size="1,1" type="rect">
+    <graph id="n5_sd8c" name="holder" xy="818,22" size="1,1">
       <relation target="n1_8xpg" sidePair="right-right"/>
     </graph>
   </displayList>

FGUIProject/assets/Main/components/ProgressBar1.xml

@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="836,43" extention="ProgressBar">
+<component size="856,40" extention="ProgressBar">
   <displayList>
-    <image id="n0_vuz5" name="n0" src="v3k9cq" fileName="imagesStory/zd_zdjdt_1.png" xy="-17,0">
+    <image id="n0_vuz5" name="n0" src="v3k9cq" fileName="imagesStory/zd_zdjdt_1.png" xy="0,0">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <component id="n5_rlp9" name="comBar" src="k1khe7" fileName="components/Component2.xml" xy="0,9"/>
-    <text id="n2_vuz5" name="txtCount" xy="10,50" size="116,44" font="ui://eg2y0ldpk1kha2" fontSize="32" color="#fcf5ec" vAlign="middle" strokeColor="#796135" strokeSize="2" text="总分：0"/>
-    <image id="n4_oixc" name="imgFirstScore" src="oixcby" fileName="imagesStory/zd_pfjdt_4.png" xy="-12,-4"/>
+    <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"/>
   </displayList>
   <ProgressBar titleType="value"/>
 </component>

FGUIProject/assets/Main/components/comClickCircle.xml

@@ -1,16 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="180,180">
-  <controller name="c1" pages="0,,1," selected="0"/>
+<component size="274,274">
   <displayList>
-    <loader id="n13_vuz5" name="loaCircle" xy="-1,-7" pivot="0.5,0.5" size="183,194" group="n12_vuz5" url="ui://mfvz4q8kvuz5bk" autoSize="true">
-      <gearDisplay controller="c1" pages="0"/>
-    </loader>
-    <graph id="n15_ez2u" name="holder" xy="90,89" size="1,1" group="n12_vuz5" touchable="false" type="rect">
-      <gearDisplay controller="c1" pages="1"/>
-    </graph>
-    <text id="n14_k1kh" name="txtPart" xy="91,89" pivot="0.5,0.5" anchor="true" size="148,94" group="n12_vuz5" fontSize="72" color="#fff8ed" align="center" strokeColor="#cc984a" strokeSize="2" text="饰品"/>
-    <graph id="n21_ez2u" name="holder1" xy="90,89" size="1,1" group="n12_vuz5" touchable="false" type="rect"/>
-    <group id="n12_vuz5" name="grpCircle" xy="-1,-7" size="183,194" advanced="true"/>
-    <component id="n7_vuz5" name="ComScoreResult" src="vuz5bi" fileName="components/ComScoreResult.xml" xy="-38,-39" visible="false" touchable="false"/>
+    <image id="n28_wono" name="n28" src="wonogn" fileName="imagesStory/zd_gxi_1.png" xy="-6,5"/>
+    <text id="n29_wono" name="txtPart" xy="79,74" pivot="0.5,0" size="103,66" fontSize="50" color="#fcf3e2" strokeColor="#c49a49" strokeSize="2" text="上衣"/>
+    <text id="n30_wono" name="txtScore" xy="69,140" pivot="0.5,0" size="123,64" fontSize="48" color="#fcf3e2" strokeColor="#c49a49" strokeSize="2" text="1880"/>
   </displayList>
 </component>

FGUIProject/assets/Main/componentsDialog/ButtonSpeedUp1.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="117,117" extention="Button">
+<component size="108,108" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
     <image id="n0_nmnb" name="n0" src="jj0mdg" fileName="images/zd_jsjs_1.png" xy="0,0">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <image id="n2_jj0m" name="n2" src="jj0mdf" fileName="images/zd_jsjs_2.png" xy="41,6"/>
-    <text id="n1_nmnb" name="title" xy="68,-2" size="39,42" fontSize="30" color="#ffffff" align="center" vAlign="middle" strokeColor="#677444" singleLine="true" text="x2">
+    <image id="n2_jj0m" name="n2" src="jj0mdf" fileName="images/zd_jsjs_2.png" xy="32,0"/>
+    <text id="n1_nmnb" name="title" xy="63,-8" size="35,37" fontSize="34" color="#f5eccf" align="center" vAlign="middle" strokeColor="#c09954" strokeSize="2" singleLine="true" text="x3">
       <relation target="" sidePair="width-width,height-height"/>
     </text>
   </displayList>

FGUIProject/assets/Main/package.xml

@@ -112,13 +112,9 @@
     <image id="8xpg4r" name="zd_jsjm_ditu.png" path="/imagesFight/"/>
     <image id="8xpg4s" name="zd_jsjm_jdt_2.png" path="/imagesFight/"/>
     <image id="8xpg4t" name="zd_jsjm_jdt_3.png" path="/imagesFight/"/>
-    <image id="8xpg4u" name="zd_jsjm_jszi_1.png" path="/imagesExport/" exported="true"/>
-    <image id="8xpg4v" name="zd_jsjm_jszi_2.png" path="/imagesExport/" exported="true"/>
-    <image id="8xpg4w" name="zd_jsjm_jszi_3.png" path="/imagesExport/" exported="true"/>
     <image id="8xpg4y" name="zd_jsjm_jyz.png" path="/imagesFight/"/>
     <component id="8xpg4z" name="CompFightScoreResult.xml" path="/components/"/>
     <component id="8xpg50" name="ProgressBarExp.xml" path="/components/"/>
-    <image id="8xpg51" name="zd_drpf_jdt_1.png" path="/imagesFight/"/>
     <component id="8xpg52" name="CompFightExpBar.xml" path="/components/"/>
     <component id="s2cc53" name="StoryFightQuicklyUI.xml" path="/" exported="true"/>
     <image id="s2cc54" name="zd_wctsxs.png" path="/imagesFight/"/>
@@ -138,7 +134,6 @@
     <component id="s2cc5k" name="CompFlower1.xml" path="/components/"/>
     <component id="s2cc5l" name="CompFlower2.xml" path="/components/"/>
     <image id="s2cc5m" name="zd_js_xing_1.png" path="/imagesStory/"/>
-    <image id="s2cc5n" name="zd_jsjm_jszi_0.png" path="/imagesExport/" exported="true"/>
     <component id="s2cc5o" name="CompFlower3.xml" path="/components/"/>
     <component id="s2cc5p" name="CompChapter10003.xml" path="/componentsLevel/" exported="true"/>
     <component id="s2cc5q" name="CompChapter10004.xml" path="/componentsLevel/" exported="true"/>
@@ -372,7 +367,6 @@
     <movieclip id="wet2f3" name="MovieClip4.jta" path="/Movie/"/>
     <component id="ox5bf5" name="Button2.xml" path="/components/"/>
     <image id="hky3fb" name="middle_img_v2_0c0211c4-7f8b-4e04-8f67-bc01ad27e8ag.png" path="/images/"/>
-    <image id="gd29fd" name="middle_img_v2_0c0211c4-7f8b-4e04-8f67-bc01ad27e8ag.png" path="/imagesStory/"/>
     <image id="jj4dfe" name="zjm_gzs.png" path="/images/"/>
     <image id="jj4dff" name="zjm_ty.png" path="/images/"/>
     <image id="r0yxfg" name="zhuxian_szdi.png" path="/images/"/>
@@ -396,6 +390,33 @@
     <image id="qqatfy" name="zjm_hdhd_2.png" path="/images/"/>
     <component id="njmnfz" name="ChangeNameUI.xml" path="/" exported="true"/>
     <image id="njmng0" name="mc_jlkuang_1.png" path="/images/"/>
+    <image id="wonog1" name="zd_jsjm_jszi_0.png" path="/imagesFight/"/>
+    <image id="wonog2" name="jz_ejd_yz.png" path="/imagesFight/"/>
+    <image id="wonog3" name="jz_sanjd_xs.png" path="/imagesFight/"/>
+    <image id="wonog4" name="jz_sijd_xs.png" path="/imagesFight/"/>
+    <image id="wonog5" name="jz_yjd_d.png" path="/imagesFight/"/>
+    <image id="wonog6" name="jz_yjd_k.png" path="/imagesFight/"/>
+    <image id="wonog7" name="zd_js_xing_1.png" path="/imagesFight/"/>
+    <image id="wonog8" name="zd_js_xing_2.png" path="/imagesFight/"/>
+    <image id="wonogc" name="zd_jsjm_jszi_1.png" path="/imagesFight/"/>
+    <image id="wonogd" name="zd_jsjm_jszi_2.png" path="/imagesFight/"/>
+    <image id="wonoge" name="zd_jsjm_jszi_3.png" path="/imagesFight/"/>
+    <component id="wonogf" name="ComResult.xml" path="/components/"/>
+    <image id="wonogg" name="zjm_txkuang.png" path="/imagesFight/"/>
+    <image id="wonogh" name="zd_drpf_jdt_1.png" path="/imagesFight/"/>
+    <component id="wonogi" name="ComHead.xml" path="/components/"/>
+    <image id="wonogj" name="zjm_txkuang_1.png" path="/imagesFight/"/>
+    <component id="wonogk" name="ComRoleResult.xml" path="/components/"/>
+    <component id="wonogm" name="ComRole.xml" path="/components/"/>
+    <image id="wonogn" name="zd_gxi_1.png" path="/imagesStory/"/>
+    <image id="wonogo" name="zd_jsjm_jdt_2.png" path="/imagesStory/"/>
+    <image id="wonogp" name="zd_jsjm_jdt_3 .png" path="/imagesStory/"/>
+    <image id="wonogq" name="zd_jsjm_jdt_3.png" path="/imagesStory/"/>
+    <component id="wonogr" name="ComScoreStage.xml" path="/components/"/>
+    <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"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

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

@@ -1,4 +1,5 @@
 using ET;
+using System;
 using System.Collections.Generic;
 using UnityEngine;
 
@@ -113,16 +114,17 @@ namespace GFGGame
         /// <param name="type">评分部位</param>
         /// <param name="showCard">是否展示卡牌效果</param>
         /// <returns></returns>
-        public double GetPartScore(int partId, int clickState, double mainScore, double skillScore)
+        public int GetPartScore(int partId, double mainScore, double skillScore)
         {
 
             //部件评分=部件基础分*部件系数
             //点击评分=（部件基础分+（+人物基础分+卡牌属性分数）*点击系数）*2.22   (新点击公式，防止点击优秀却因为未穿衣服结果是0分)
             //卡牌评分=总属性*技能配表百分比
             double partScore = GetPartItemScore(partId);
-            double clickScore = ScoreSystemData.Instance.GetPartItemClickScore(partId, clickState);
+            // double clickScore = ScoreSystemData.Instance.GetPartItemClickScore(partId, clickState);
 
-            return (partScore + clickScore + skillScore);
+            // return (partScore + clickScore + skillScore);
+            return (int)Math.Round((partScore + skillScore));
         }
         public double GetPartItemScore(int partId)
         {
@@ -165,7 +167,7 @@ namespace GFGGame
 
                 if (partId == skillCfg.subTypes || skillCfg.subTypes == 0)
                 {
-                    int isProbability = Random.Range(0, 10000) < skillLvCfg.probability ? 1 : 0;
+                    int isProbability = UnityEngine.Random.Range(0, 10000) < skillLvCfg.probability ? 1 : 0;
                     if (showCard != true && skillCfg.mainSkill == 1 && isProbability == 1)
                     {
                         //卡牌中包含主技能且此技能被触发，在评分阶段才展示卡牌效果，一张卡牌只要有一个技能需要显示，那就直接显示

GameClient/Assets/Game/HotUpdate/DressUp/DressUpObjDataCache.cs

@@ -41,6 +41,8 @@ namespace GFGGame
                 return _isPic;
             }
         }
+        public NTexture nTexture { get; set; }
+
         private List<int> _equipDatas = new List<int>();
         public List<int> equipDatas
         {

GameClient/Assets/Game/HotUpdate/DressUp/DressUpUtil.cs

@@ -228,12 +228,12 @@ namespace GFGGame
             var aniObjName = string.Format(FORMAT_ANIMATION_NAME, itemCfg.subType, layerId);
             TryRemoveAnimationObj(parentObj, aniObjName);
             string ext = ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType);
-          GameObject gameObject=  AddSpriteObj(res, ext, spritObjName, parentObj, sortingOrder, needSetMask);
+            GameObject gameObject = AddSpriteObj(res, ext, spritObjName, parentObj, sortingOrder, needSetMask);
             if (itemCfg.subType == (int)ConstDressUpItemType.BEI_JING)
             {
                 gameObject.layer = 6;//设置bg层
             }
-                if (itemCfg.isAni > 0 && showAni)
+            if (itemCfg.isAni > 0 && showAni)
             {
                 AddAnimationObj(res, aniObjName, parentObj, sortingOrder);
                 Timers.inst.Add(0.03f, 1, (obj) =>
@@ -452,7 +452,7 @@ namespace GFGGame
             Rect rect = new Rect(0, 0, UnityEngine.Screen.width, UnityEngine.Screen.height);
             RenderTexture render = new RenderTexture((int)rect.width, (int)rect.height, -1);//创建一个RenderTexture对象 
 
-            camera.gameObject.SetActive(true);//启用截图相机
+            // camera.gameObject.SetActive(true);//启用截图相机
             camera.targetTexture = render;//设置截图相机的targetTexture为render
             camera.Render();//手动开启截图相机的渲染
 
@@ -464,8 +464,8 @@ namespace GFGGame
             camera.targetTexture = null;//重置截图相机的targetTexture
             RenderTexture.active = null;//关闭RenderTexture的激活状态
             Object.Destroy(render);//删除RenderTexture对象
-            camera.gameObject.SetActive(true);
-          
+            // camera.gameObject.SetActive(true);
+
             return new NTexture(tex);
 
         }

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

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Main
+{
+    public partial class UI_ComResult
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GLoader m_logResult;
+        public GTextField m_txtScore;
+        public const string URL = "ui://mfvz4q8kwonogf";
+        public const string PACKAGE_NAME = "Main";
+        public const string RES_NAME = "ComResult";
+        private static UI_ComResult _proxy;
+
+        public static UI_ComResult Create(GObject gObject = null)
+        {
+            var ui = new UI_ComResult();
+            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_ComResult Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComResult();
+            }
+            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");
+            m_logResult = (GLoader)comp.GetChild("logResult");
+            m_txtScore = (GTextField)comp.GetChild("txtScore");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_logResult = null;
+            m_txtScore = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComAllCircle.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComResult.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 3bbfa9a5a0c73954387d5be97200d6d7
+guid: 788211e734c45af4ea2cafef5446fe58
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompFlower3.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComRole.cs

@@ -4,20 +4,19 @@ using FairyGUI;
 
 namespace UI.Main
 {
-    public partial class UI_CompFlower3
+    public partial class UI_ComRole
     {
         public GComponent target;
-        public GImage m_f1;
-        public GImage m_f2;
-        public GImage m_f3;
-        public const string URL = "ui://mfvz4q8ks2cc5o";
+        public GLoader m_loaBg;
+        public GLoader m_loaRole;
+        public const string URL = "ui://mfvz4q8kwonogm";
         public const string PACKAGE_NAME = "Main";
-        public const string RES_NAME = "CompFlower3";
-        private static UI_CompFlower3 _proxy;
+        public const string RES_NAME = "ComRole";
+        private static UI_ComRole _proxy;
 
-        public static UI_CompFlower3 Create(GObject gObject = null)
+        public static UI_ComRole Create(GObject gObject = null)
         {
-            var ui = new UI_CompFlower3();
+            var ui = new UI_ComRole();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -26,11 +25,11 @@ namespace UI.Main
             return ui;
         }
 
-        public static UI_CompFlower3 Proxy(GObject gObject = null)
+        public static UI_ComRole Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_CompFlower3();
+                _proxy = new UI_ComRole();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -57,15 +56,13 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
-            m_f1 = (GImage)comp.GetChild("f1");
-            m_f2 = (GImage)comp.GetChild("f2");
-            m_f3 = (GImage)comp.GetChild("f3");
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_loaRole = (GLoader)comp.GetChild("loaRole");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_f1 = null;
-            m_f2 = null;
-            m_f3 = null;
+            m_loaBg = null;
+            m_loaRole = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComScoreResult.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComRole.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c26f6e1807329cc458020e02c2813779
+guid: e25b986b31e808046b5f8351f178fc06
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComAllCircle.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComRoleResult.cs

@@ -4,23 +4,19 @@ using FairyGUI;
 
 namespace UI.Main
 {
-    public partial class UI_ComAllCircle
+    public partial class UI_ComRoleResult
     {
         public GComponent target;
-        public GImage m_imgCircle;
-        public GGraph m_holder;
-        public GImage m_img;
-        public GTextField m_txtCount;
-        public Transition m_t0;
-        public Transition m_t1;
-        public const string URL = "ui://mfvz4q8kcn279k";
+        public Controller m_c1;
+        public UI_ComRole m_comRole;
+        public const string URL = "ui://mfvz4q8kwonogk";
         public const string PACKAGE_NAME = "Main";
-        public const string RES_NAME = "ComAllCircle";
-        private static UI_ComAllCircle _proxy;
+        public const string RES_NAME = "ComRoleResult";
+        private static UI_ComRoleResult _proxy;
 
-        public static UI_ComAllCircle Create(GObject gObject = null)
+        public static UI_ComRoleResult Create(GObject gObject = null)
         {
-            var ui = new UI_ComAllCircle();
+            var ui = new UI_ComRoleResult();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -29,11 +25,11 @@ namespace UI.Main
             return ui;
         }
 
-        public static UI_ComAllCircle Proxy(GObject gObject = null)
+        public static UI_ComRoleResult Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ComAllCircle();
+                _proxy = new UI_ComRoleResult();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -60,21 +56,14 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
-            m_imgCircle = (GImage)comp.GetChild("imgCircle");
-            m_holder = (GGraph)comp.GetChild("holder");
-            m_img = (GImage)comp.GetChild("img");
-            m_txtCount = (GTextField)comp.GetChild("txtCount");
-            m_t0 = comp.GetTransition("t0");
-            m_t1 = comp.GetTransition("t1");
+            m_c1 = comp.GetController("c1");
+            m_comRole = (UI_ComRole)UI_ComRole.Create(comp.GetChild("comRole"));
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_imgCircle = null;
-            m_holder = null;
-            m_img = null;
-            m_txtCount = null;
-            m_t0 = null;
-            m_t1 = null;
+            m_c1 = null;
+            m_comRole.Dispose();
+            m_comRole = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompFightScore.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComRoleResult.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: b077f64ee9f93aa47afcb122fc8feb49
+guid: 4cb004de40fd91644bdab3c5827f35d6
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -1,98 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.Main
-{
-    public partial class UI_ComScoreResult
-    {
-        public GComponent target;
-        public Controller m_c1;
-        public GGraph m_holder2;
-        public GGraph m_holder;
-        public GGraph m_holder1;
-        public GLoader m_loaType;
-        public GTextField m_txtCount0;
-        public GTextField m_txtCount1;
-        public GTextField m_txtCount2;
-        public GGraph m_graph;
-        public Transition m_t0;
-        public const string URL = "ui://mfvz4q8kvuz5bi";
-        public const string PACKAGE_NAME = "Main";
-        public const string RES_NAME = "ComScoreResult";
-        private static UI_ComScoreResult _proxy;
-
-        public static UI_ComScoreResult Create(GObject gObject = null)
-        {
-            var ui = new UI_ComScoreResult();
-            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_ComScoreResult Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_ComScoreResult();
-            }
-            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");
-            m_holder2 = (GGraph)comp.GetChild("holder2");
-            m_holder = (GGraph)comp.GetChild("holder");
-            m_holder1 = (GGraph)comp.GetChild("holder1");
-            m_loaType = (GLoader)comp.GetChild("loaType");
-            m_txtCount0 = (GTextField)comp.GetChild("txtCount0");
-            m_txtCount1 = (GTextField)comp.GetChild("txtCount1");
-            m_txtCount2 = (GTextField)comp.GetChild("txtCount2");
-            m_graph = (GGraph)comp.GetChild("graph");
-            m_t0 = comp.GetTransition("t0");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_c1 = null;
-            m_holder2 = null;
-            m_holder = null;
-            m_holder1 = null;
-            m_loaType = null;
-            m_txtCount0 = null;
-            m_txtCount1 = null;
-            m_txtCount2 = null;
-            m_graph = null;
-            m_t0 = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompFightScore.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComScoreStage.cs

@@ -4,18 +4,18 @@ using FairyGUI;
 
 namespace UI.Main
 {
-    public partial class UI_CompFightScore
+    public partial class UI_ComScoreStage
     {
         public GComponent target;
-        public GTextField m_txtScore;
-        public const string URL = "ui://mfvz4q8k8xpg4e";
+        public GImage m_imgFirstScore;
+        public const string URL = "ui://mfvz4q8kwonogr";
         public const string PACKAGE_NAME = "Main";
-        public const string RES_NAME = "CompFightScore";
-        private static UI_CompFightScore _proxy;
+        public const string RES_NAME = "ComScoreStage";
+        private static UI_ComScoreStage _proxy;
 
-        public static UI_CompFightScore Create(GObject gObject = null)
+        public static UI_ComScoreStage Create(GObject gObject = null)
         {
-            var ui = new UI_CompFightScore();
+            var ui = new UI_ComScoreStage();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -24,11 +24,11 @@ namespace UI.Main
             return ui;
         }
 
-        public static UI_CompFightScore Proxy(GObject gObject = null)
+        public static UI_ComScoreStage Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_CompFightScore();
+                _proxy = new UI_ComScoreStage();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -55,11 +55,11 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
-            m_txtScore = (GTextField)comp.GetChild("txtScore");
+            m_imgFirstScore = (GImage)comp.GetChild("imgFirstScore");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_txtScore = null;
+            m_imgFirstScore = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompFlower3.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComScoreStage.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 8db71ae1b6c105a4b921a47cf52cb32a
+guid: a013313f535167848ab8e091a23ba4e6
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -7,7 +7,6 @@ namespace UI.Main
     public partial class UI_CompFightExpBar
     {
         public GComponent target;
-        public GComponent m_iconHead;
         public GTextField m_txtLvl;
         public GTextField m_txtLvlAdded;
         public UI_Component6 m_pbExp;
@@ -58,14 +57,12 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
-            m_iconHead = (GComponent)comp.GetChild("iconHead");
             m_txtLvl = (GTextField)comp.GetChild("txtLvl");
             m_txtLvlAdded = (GTextField)comp.GetChild("txtLvlAdded");
             m_pbExp = (UI_Component6)UI_Component6.Create(comp.GetChild("pbExp"));
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_iconHead = null;
             m_txtLvl = null;
             m_txtLvlAdded = null;
             m_pbExp.Dispose();

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

@@ -9,7 +9,8 @@ namespace UI.Main
         public GProgressBar target;
         public UI_Component2 m_comBar;
         public GTextField m_txtCount;
-        public GImage m_imgFirstScore;
+        public UI_ComScoreStage m_comFirstScore;
+        public UI_ComScoreStage m_comSecondScore;
         public const string URL = "ui://mfvz4q8kvuz5bh";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "ProgressBar1";
@@ -59,14 +60,18 @@ namespace UI.Main
         {
             m_comBar = (UI_Component2)UI_Component2.Create(comp.GetChild("comBar"));
             m_txtCount = (GTextField)comp.GetChild("txtCount");
-            m_imgFirstScore = (GImage)comp.GetChild("imgFirstScore");
+            m_comFirstScore = (UI_ComScoreStage)UI_ComScoreStage.Create(comp.GetChild("comFirstScore"));
+            m_comSecondScore = (UI_ComScoreStage)UI_ComScoreStage.Create(comp.GetChild("comSecondScore"));
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_comBar.Dispose();
             m_comBar = null;
             m_txtCount = null;
-            m_imgFirstScore = null;
+            m_comFirstScore.Dispose();
+            m_comFirstScore = null;
+            m_comSecondScore.Dispose();
+            m_comSecondScore = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -7,15 +7,11 @@ namespace UI.Main
     public partial class UI_StoryFightResultUI
     {
         public GComponent target;
-        public Controller m_c1;
-        public UI_CompFightExpBar m_expBar;
+        public GLoader m_loaBg;
         public GGraph m_btnClose;
-        public GLoader m_bg;
-        public GGraph m_holder;
-        public GTextField m_txtScore;
-        public UI_CompFlower3 m_flower;
-        public GGroup m_grpTop;
-        public Transition m_t0;
+        public UI_ComResult m_comResult;
+        public UI_ComRoleResult m_ComRoleResult;
+        public UI_CompFightExpBar m_comExpBar;
         public const string URL = "ui://mfvz4q8k8xpg3y";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "StoryFightResultUI";
@@ -63,29 +59,22 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
-            m_c1 = comp.GetController("c1");
-            m_expBar = (UI_CompFightExpBar)UI_CompFightExpBar.Create(comp.GetChild("expBar"));
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_btnClose = (GGraph)comp.GetChild("btnClose");
-            m_bg = (GLoader)comp.GetChild("bg");
-            m_holder = (GGraph)comp.GetChild("holder");
-            m_txtScore = (GTextField)comp.GetChild("txtScore");
-            m_flower = (UI_CompFlower3)UI_CompFlower3.Create(comp.GetChild("flower"));
-            m_grpTop = (GGroup)comp.GetChild("grpTop");
-            m_t0 = comp.GetTransition("t0");
+            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"));
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_c1 = null;
-            m_expBar.Dispose();
-            m_expBar = null;
+            m_loaBg = null;
             m_btnClose = null;
-            m_bg = null;
-            m_holder = null;
-            m_txtScore = null;
-            m_flower.Dispose();
-            m_flower = null;
-            m_grpTop = null;
-            m_t0 = null;
+            m_comResult.Dispose();
+            m_comResult = null;
+            m_ComRoleResult.Dispose();
+            m_ComRoleResult = null;
+            m_comExpBar.Dispose();
+            m_comExpBar = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -10,9 +10,9 @@ namespace UI.Main
         public GLoader m_loaBg;
         public GLoader m_loaRole;
         public GButton m_btnBack;
-        public UI_CompFightScore m_selfScore;
+        public UI_ProgressBar1 m_proScore;
+        public GLoader m_loaGlass;
         public UI_comClickCircle m_comClickCircle;
-        public UI_ComAllCircle m_comAllCircle;
         public GGraph m_grh_0;
         public GGraph m_grh_1;
         public GGraph m_grh_2;
@@ -21,9 +21,8 @@ namespace UI.Main
         public GGraph m_grh_5;
         public GGraph m_grh_6;
         public GGraph m_grh_7;
-        public UI_ProgressBar1 m_proScore;
         public GButton m_btnSpeedUp;
-        public GGraph m_holderPartScore;
+        public Transition m_t1;
         public const string URL = "ui://mfvz4q8k8xpg3x";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "StoryFightSingleScoreUI";
@@ -74,9 +73,9 @@ namespace UI.Main
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_loaRole = (GLoader)comp.GetChild("loaRole");
             m_btnBack = (GButton)comp.GetChild("btnBack");
-            m_selfScore = (UI_CompFightScore)UI_CompFightScore.Create(comp.GetChild("selfScore"));
+            m_proScore = (UI_ProgressBar1)UI_ProgressBar1.Create(comp.GetChild("proScore"));
+            m_loaGlass = (GLoader)comp.GetChild("loaGlass");
             m_comClickCircle = (UI_comClickCircle)UI_comClickCircle.Create(comp.GetChild("comClickCircle"));
-            m_comAllCircle = (UI_ComAllCircle)UI_ComAllCircle.Create(comp.GetChild("comAllCircle"));
             m_grh_0 = (GGraph)comp.GetChild("grh_0");
             m_grh_1 = (GGraph)comp.GetChild("grh_1");
             m_grh_2 = (GGraph)comp.GetChild("grh_2");
@@ -85,21 +84,19 @@ namespace UI.Main
             m_grh_5 = (GGraph)comp.GetChild("grh_5");
             m_grh_6 = (GGraph)comp.GetChild("grh_6");
             m_grh_7 = (GGraph)comp.GetChild("grh_7");
-            m_proScore = (UI_ProgressBar1)UI_ProgressBar1.Create(comp.GetChild("proScore"));
             m_btnSpeedUp = (GButton)comp.GetChild("btnSpeedUp");
-            m_holderPartScore = (GGraph)comp.GetChild("holderPartScore");
+            m_t1 = comp.GetTransition("t1");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
             m_loaRole = null;
             m_btnBack = null;
-            m_selfScore.Dispose();
-            m_selfScore = null;
+            m_proScore.Dispose();
+            m_proScore = null;
+            m_loaGlass = null;
             m_comClickCircle.Dispose();
             m_comClickCircle = null;
-            m_comAllCircle.Dispose();
-            m_comAllCircle = null;
             m_grh_0 = null;
             m_grh_1 = null;
             m_grh_2 = null;
@@ -108,10 +105,8 @@ namespace UI.Main
             m_grh_5 = null;
             m_grh_6 = null;
             m_grh_7 = null;
-            m_proScore.Dispose();
-            m_proScore = null;
             m_btnSpeedUp = null;
-            m_holderPartScore = null;
+            m_t1 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -7,13 +7,8 @@ namespace UI.Main
     public partial class UI_comClickCircle
     {
         public GComponent target;
-        public Controller m_c1;
-        public GLoader m_loaCircle;
-        public GGraph m_holder;
         public GTextField m_txtPart;
-        public GGraph m_holder1;
-        public GGroup m_grpCircle;
-        public UI_ComScoreResult m_ComScoreResult;
+        public GTextField m_txtScore;
         public const string URL = "ui://mfvz4q8kn0js9b";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "comClickCircle";
@@ -61,24 +56,13 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
-            m_c1 = comp.GetController("c1");
-            m_loaCircle = (GLoader)comp.GetChild("loaCircle");
-            m_holder = (GGraph)comp.GetChild("holder");
             m_txtPart = (GTextField)comp.GetChild("txtPart");
-            m_holder1 = (GGraph)comp.GetChild("holder1");
-            m_grpCircle = (GGroup)comp.GetChild("grpCircle");
-            m_ComScoreResult = (UI_ComScoreResult)UI_ComScoreResult.Create(comp.GetChild("ComScoreResult"));
+            m_txtScore = (GTextField)comp.GetChild("txtScore");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_c1 = null;
-            m_loaCircle = null;
-            m_holder = null;
             m_txtPart = null;
-            m_holder1 = null;
-            m_grpCircle = null;
-            m_ComScoreResult.Dispose();
-            m_ComScoreResult = null;
+            m_txtScore = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpFightView.cs

@@ -425,16 +425,16 @@ namespace GFGGame
                 FieldFightDataManager.Instance.currentLevelCfgId = InstanceZonesDataManager.currentLevelCfgId;
                 FieldFightDataManager.Instance.equipDatas = EquipDataCache.cacher.equipDatas;
             }
-            Camera camera = _sceneObject.transform.Find("Camera").gameObject.GetComponent<Camera>();
-            NTexture nTexture = DressUpUtil.GetPrintscreenNTexture(camera);
 
+            Camera camera = _sceneObject.transform.Find("Camera").gameObject.GetComponent<Camera>();
+            EquipDataCache.cacher.nTexture = DressUpUtil.GetPrintscreenNTexture(camera);
             if (hasFightTarget)
             {
-                ViewManager.Show(ViewName.STORY_FIGHT_TARGET_VIEW, nTexture);
+                ViewManager.Show(ViewName.STORY_FIGHT_TARGET_VIEW);
             }
             else
             {
-                ViewManager.Show(ViewName.STORY_FIGHT_SINGLE_VIEW, nTexture);
+                ViewManager.Show(ViewName.STORY_FIGHT_SINGLE_VIEW);
             }
             this.Hide();
 
@@ -451,7 +451,7 @@ namespace GFGGame
             InstanceZonesDataManager.usedRecommend = true;
             EquipDataCache.cacher.PutOnRecommendItems();
             UpdateListPartsSelected();
-            UpdateListSuitPartsSelected();          
+            UpdateListSuitPartsSelected();
         }
 
         private void InitLists()

GameClient/Assets/Game/HotUpdate/Views/DressUp/PhotographSaveView.cs

@@ -45,6 +45,10 @@ namespace GFGGame
         protected override void OnHide()
         {
             base.OnHide();
+            _ui.m_btnSave.selected = false;
+            _ui.m_btnSave.touchable = true;
+            _ui.m_btnSavePhoto.selected = false;
+            _ui.m_btnSavePhoto.touchable = true;
         }
 
         public override void Dispose()
@@ -59,15 +63,15 @@ namespace GFGGame
 
         private void OnClickBtnSave()
         {
-            // Texture2D tex = this.viewData as Texture2D;
-            // byte[] bytes = tex.EncodeToJPG();//将纹理数据，转化成一个jpg图片
             string fileName = "wsj" + TimeHelper.ServerNowSecs + ".jpg";
-
             PhotographDataManager.Instance.SavePicturoToLocal(bytes, fileName);
+            _ui.m_btnSave.touchable = false;
+
         }
 
         private async void OnClickBtnSavePhoto()
         {
+
             if (PoemPhotoDataManager.Instance.PersonalPhotoInfos.Count >= GlobalCfgArray.globalCfg.maxPhotoCount)
             {
                 PromptController.Instance.ShowFloatTextPrompt("照片数量已达上限");
@@ -97,6 +101,8 @@ namespace GFGGame
                     }
                 }
             }
+            _ui.m_btnSavePhoto.touchable = false;
+
         }
     }
 }

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

@@ -12,11 +12,11 @@ namespace GFGGame
         private GameObject _sceneObject;
         private GameObject _scenePrefab;
         private int _index;//当前评分part
-        private double _score;//当前总分数
+        private int _score;//当前总分数
         private double _skillScore = 0;//当前卡牌技能分
+        private int _partScore = 0;//当前部件分+技能评分（_skillScore）
         private bool _showCard = false;//当前是否显示卡牌技能
         private double _mainScore;//总主属性分
-        private int _prefectCount = 0;//卓越点击数量
         private const int _range = 100;//圆圈随机范围
         private const float _prefectScale = 60f;//完美缩放比
         private float _time = 0;// 登峰造极按住的时间
@@ -24,22 +24,14 @@ namespace GFGGame
         private float _playTime = 2.5f;
         private bool _stopFight = false;
 
-        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 GoWrapper _wrapper0;
-        private GoWrapper _wrapper1;
-        private GoWrapper _wrapper2;
-        private GoWrapper _wrapper5;
-        private GoWrapper _wrapper6;
-        private GoWrapper _wrapper7;
-        private GoWrapper _wrapper8;
+        // private GameObject _gameObject0;
+        // private GameObject _gameObject1;
+        // private GameObject _gameObject2;
+
+        // private GoWrapper _wrapper0;
+        // private GoWrapper _wrapper1;
+        // private GoWrapper _wrapper2;
+
 
         public override void Dispose()
         {
@@ -48,15 +40,10 @@ namespace GFGGame
                 GameObject.Destroy(_sceneObject);
                 _sceneObject = null;
             }
-            SceneController.DestroyObjectFromView(_gameObject0, _wrapper0);
-            SceneController.DestroyObjectFromView(_gameObject1, _wrapper1);
-            SceneController.DestroyObjectFromView(_gameObject2, _wrapper2);
-            // SceneController.DestroyObjectFromView(_gameObject3);
-            // SceneController.DestroyObjectFromView(_gameObject4);
-            SceneController.DestroyObjectFromView(_gameObject5, _wrapper5);
-            SceneController.DestroyObjectFromView(_gameObject6, _wrapper6);
-            SceneController.DestroyObjectFromView(_gameObject7, _wrapper7);
-            SceneController.DestroyObjectFromView(_gameObject8, _wrapper8);
+            // SceneController.DestroyObjectFromView(_gameObject0, _wrapper0);
+            // SceneController.DestroyObjectFromView(_gameObject1, _wrapper1);
+            // SceneController.DestroyObjectFromView(_gameObject2, _wrapper2);
+
             if (_ui != null)
             {
                 _ui.Dispose();
@@ -75,36 +62,28 @@ namespace GFGGame
             _scenePrefab = GFGAsset.Load<GameObject>(ResPathUtil.GetPrefabPath("SceneFightSingleScore"));
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
             _ui.m_btnSpeedUp.onClick.Add(OnBtnSpeedUp);
-            
-            _ui.m_loaBg.url = ResPathUtil.GetFightBgImgPath("zd_bj_bja_2");
 
-            AddEffect();
+            _ui.m_loaBg.url = ResPathUtil.GetFightBgImgPath("zd_bj_bja_2");
 
         }
         protected override void AddEventListener()
         {
             base.AddEventListener();
-            EventAgent.AddEventListener(ConstMessage.CARD_SKILL, CircleScoreStart);
+            EventAgent.AddEventListener(ConstMessage.CARD_SKILL, PartScoreStart);
         }
         protected override void OnShown()
         {
             base.OnShown();
-            NTexture nTexture = this.viewData as NTexture;
             //if (_sceneObject == null) _sceneObject = GameObject.Instantiate(_scenePrefab);
             //SceneController.UpdateRole(EquipDataCache.cacher.equipDatas, _sceneObject);
-            _ui.m_loaRole.texture = 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);
 
-            _gameObject2.SetActive(false);
-            _ui.m_comClickCircle.target.onClick.Add(CircleScoreEnd);
-            _ui.m_comAllCircle.target.onTouchBegin.Add(OnComAllCircleClickBegin);
-            _ui.m_comAllCircle.target.onTouchEnd.Add(AllCircleScoreStart);
-            _ui.m_comAllCircle.target.visible = false;
             _ui.m_btnSpeedUp.visible = EquipDataCache.cacher.autoPlay;
             _ui.m_btnSpeedUp.title = "x" + EquipDataCache.cacher.fightSpeed;
 
             _ui.m_comClickCircle.target.touchable = !EquipDataCache.cacher.autoPlay;
-            _ui.m_comAllCircle.target.touchable = !EquipDataCache.cacher.autoPlay;
 
             ScoreSystemData.Instance.SetEquipDicWithType();
 
@@ -112,13 +91,13 @@ namespace GFGGame
             StoryFightCfg fightCfg = StoryFightCfgArray.Instance.GetCfg(levelCfg.fightID);
             _ui.m_proScore.target.max = fightCfg.score3;
             _ui.m_proScore.m_comBar.target.width = 0;
-            _ui.m_proScore.m_imgFirstScore.x = (((float)fightCfg.score1 / (float)fightCfg.score3)) * _ui.m_proScore.target.width;
+            _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_txtCount.text = "总分 0";
 
             _stopFight = false;
             _index = 0;
             _score = 0;
-            _prefectCount = 0;
             _mainScore = ScoreSystemData.Instance.GetMainScore();
 
             if (_index == 0 && GuideDataManager.IsGuideFinish(ConstGuideId.SINGLE_FIGHT) <= 0)//引导中禁止自动战斗
@@ -128,17 +107,16 @@ namespace GFGGame
             }
             Timers.inst.Add(0.5f, 1, (param) =>
             {
-                SkillScoreStart(null);
+                SkillScore(null);
             });//评分结束
             Timers.inst.AddUpdate(CheckGuide);
         }
 
-        private void SkillScoreStart(object param)
+        private void SkillScore(object param)
         {
             if (_stopFight) return;
             Debug.Log("_index:" + _index + "   length:" + FightScoreCfgArray.Instance.dataArray.Length);
             int partId = FightScoreCfgArray.Instance.dataArray[_index].id;
-            _ui.m_comClickCircle.m_txtPart.text = FightScoreCfgArray.Instance.GetCfg(_index + 1).name;
 
             _skillScore = 0;//技能附加分
             _showCard = false;
@@ -149,98 +127,63 @@ namespace GFGGame
             }
             else
             {
-                CircleScoreStart();
+                PartScoreStart();
             }
         }
 
-        private void CircleScoreStart()
+        private void PartScoreStart()
         {
+            int partId = FightScoreCfgArray.Instance.dataArray[_index].id;
+            _ui.m_comClickCircle.m_txtPart.text = FightScoreCfgArray.Instance.GetCfg(_index + 1).name;
+            _partScore = ScoreSystemData.Instance.GetPartScore(partId, _mainScore, _skillScore);
+            _ui.m_comClickCircle.m_txtScore.text = _partScore.ToString();
+            _score += _partScore;
+
             Debug.Log("index:" + _index);
             Vector2 pos = (_ui.target.GetChild("grh_" + _index).asGraph).xy;
             float x = 0f;
             float y = 0f;
-
             EquipDataCache.cacher.GetCirclePos(pos, _range, out x, out y);
             _ui.m_comClickCircle.target.SetXY(x, y);
-            _ui.m_comClickCircle.target.visible = true;
-            _ui.m_comClickCircle.target.onClick.Add(CircleScoreEnd);
+            _ui.m_loaGlass.SetXY(x, y);
+            _ui.m_loaGlass.url = string.Format("ui://Main/zd_bl_{0}", UnityEngine.Random.Range(0, 3));
 
-            // string resPath6 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_an_sf");
             if (_index == 0 && GuideDataManager.IsGuideFinish(ConstGuideId.SINGLE_FIGHT) <= 0)
             {
                 _ui.m_comClickCircle.target.touchable = false;
-                _ui.m_comClickCircle.m_loaCircle.touchable = false;
 
-                GTween.To(100, _prefectScale, _playTime / 2).SetTarget(_gameObject7).OnUpdate((GTweener t) =>
-                {
-                    _gameObject7.transform.localScale = new Vector3(t.value.x, t.value.x, t.value.x);
-                });
+                // GTween.To(100, _prefectScale, _playTime / 2).SetTarget(_gameObject7).OnUpdate((GTweener t) =>
+                // {
+                //     _gameObject7.transform.localScale = new Vector3(t.value.x, t.value.x, t.value.x);
+                // });
             }
             else
             {
 
-                _ui.m_comClickCircle.m_grpCircle.visible = true;
-                _ui.m_comClickCircle.m_c1.selectedIndex = 0;
-                float scale = EquipDataCache.cacher.autoPlay ? _prefectScale : 0;
-                float time = (1 - scale / 100f) * _playTime / EquipDataCache.cacher.fightSpeed;
-                GTween.To(100, scale, time).SetTarget(_gameObject7).OnUpdate((GTweener t) =>
-                {
-                    if (t.value.x <= _prefectScale && _ui.m_comClickCircle.m_c1.selectedIndex == 0)
-                    {
-                        _ui.m_comClickCircle.m_c1.selectedIndex = 1;
-                    }
-                    _gameObject7.transform.localScale = new Vector3(t.value.x, t.value.x, t.value.x);
 
-                }).OnComplete(CircleScoreEnd);
+                _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_proScore.target.y);
+                _ui.m_t1.Play(UpdateProgress);
             }
 
         }
-        private string[] paths = { "zd_df_sb", "zd_df_lv", "zd_df_cheng" };
-        private void CircleScoreEnd()
-        {
-            _ui.m_comClickCircle.target.onClick.Remove(CircleScoreEnd);
-            int clickState = GetClickState();
-            GTweener twener = GTween.GetTween(_gameObject7);
-            if (twener != null)
-            {
-                twener.Kill();
-            }
-            // _ui.m_comClickCircle.m_t0.Stop(true, false);
-            _ui.m_comClickCircle.m_grpCircle.visible = false;
-            string resPath = ResPathUtil.GetViewEffectPath("ui_zhandou", paths[clickState]);
-            SceneController.AddObjectToView(_gameObject2, null, _ui.m_comClickCircle.m_ComScoreResult.m_holder, resPath, out _gameObject2, out _wrapper2, 59);
-            _gameObject2.SetActive(true);
-
-            _ui.m_comClickCircle.m_ComScoreResult.m_c1.selectedIndex = clickState;
-            _ui.m_comClickCircle.m_ComScoreResult.target.visible = true;
-            _ui.m_comClickCircle.m_ComScoreResult.m_t0.ignoreEngineTimeScale = false;
-            _ui.m_comClickCircle.m_ComScoreResult.m_t0.timeScale = EquipDataCache.cacher.fightSpeed;
-            _ui.m_comClickCircle.m_ComScoreResult.m_t0.Play(() =>
-            {
-                _gameObject2.SetActive(false);
-                _ui.m_comClickCircle.m_ComScoreResult.target.visible = false;
-                PlayScoreTWEffect();
-                CircleResuleEnd();
 
-            });
-            UpdateCircleResult(clickState);
-
-        }
-        private void UpdateCircleResult(int clickState)
+        private void UpdateProgress()
         {
-            //只显示部件分加基础分
-            UI_ComScoreResult comScoreResult = UI_ComScoreResult.Proxy(_ui.m_comClickCircle.m_ComScoreResult.target);
-            int partId = FightScoreCfgArray.Instance.dataArray[_index].id;
-            double partScore = ScoreSystemData.Instance.GetPartItemScore(partId);
-            double clickScore = +ScoreSystemData.Instance.GetPartItemClickScore(partId, clickState);
-            int count = (int)(partScore + clickScore);
-
-            comScoreResult.m_txtCount0.text = count.ToString();
-            comScoreResult.m_txtCount1.text = count.ToString();
-            comScoreResult.m_txtCount2.text = count.ToString();
-            ET.Log.Debug("count:" + count);
-            _score += ScoreSystemData.Instance.GetPartScore(partId, clickState, _mainScore, _skillScore);
-            UI_ComScoreResult.ProxyEnd();
+            double proportion = _score / _ui.m_proScore.target.max;
+            float width = (float)(proportion * _ui.m_proScore.target.width);
+            width = width > _ui.m_proScore.m_comBar.target.initWidth ? _ui.m_proScore.m_comBar.target.initWidth : width;
+            GTween.To(_ui.m_proScore.m_comBar.target.width, width, 0.5f).SetTarget(_ui.m_proScore.m_comBar).OnUpdate((GTweener t) =>
+                {
+                    _ui.m_proScore.m_comBar.target.width = t.value.x;
+                }).OnComplete(() =>
+                {
+                    EquipDataCache.cacher.totalScore = _score;
+                    _ui.m_proScore.m_txtCount.text = string.Format("总分 {0}", _score);
+                    CircleResuleEnd();
+                });
         }
 
         private void CircleResuleEnd()
@@ -248,95 +191,17 @@ namespace GFGGame
             _index++;
             if (_index >= FightScoreCfgArray.Instance.dataArray.Length)
             {
-                if (_prefectCount == FightScoreCfgArray.Instance.dataArray.Length)
-                {
-                    AllCirclePlayStart();//完美八连击
-                }
-                else
-                {
-                    Timers.inst.Add(0.5f, 1, Skip);//评分结束
-                }
-            }
-            else
-            {
-
-                _ui.m_comClickCircle.m_loaCircle.onClick.Add(CircleScoreEnd);
-                Timers.inst.Add(ConstScoreSystem.REFRESH_CIRCLE_WITE_TIME / EquipDataCache.cacher.fightSpeed, 1, SkillScoreStart);//下个部分评分
-            }
-        }
-
-        private void AllCirclePlayStart()
-        {
-            //登峰造极评分开始
-            _ui.m_comAllCircle.target.visible = true;
-            _ui.m_comAllCircle.m_t0.ignoreEngineTimeScale = false;
-            _ui.m_comAllCircle.m_t0.timeScale = EquipDataCache.cacher.fightSpeed;// 1 / _speed;
-            _ui.m_comAllCircle.m_t0.Play(() =>
-            {
-                AllCircleScoreStart();
-                _ui.m_comAllCircle.m_t1.Play(() =>
-                {
-                    PlayScoreTWEffect();
-                    Timers.inst.Add(1f, 1, Skip);
-                });
-
-            });
-        }
-        private void OnComAllCircleClickBegin()
-        {
-            if (_ui.m_comAllCircle.m_imgCircle.visible == false)
-            {
-                Timers.inst.Remove(ComAllCirclePressTime);
+                Timers.inst.Add(0.5f, 1, Skip);//评分结束
             }
             else
             {
-                Timers.inst.Add(0.1f, 0, ComAllCirclePressTime);
+                Timers.inst.Add(ConstScoreSystem.REFRESH_CIRCLE_WITE_TIME / EquipDataCache.cacher.fightSpeed, 1, SkillScore);//下个部分评分
             }
         }
-        private void ComAllCirclePressTime(object param = null)
-        {
-            //登峰造极长按时间
-            _time += 0.1f;
-        }
-        private void AllCircleScoreStart()
-        {
-            Timers.inst.Remove(ComAllCirclePressTime);
-            _ui.m_comAllCircle.m_t0.Stop();
-            _ui.m_comAllCircle.target.onTouchBegin.Remove(OnComAllCircleClickBegin);
-            _ui.m_comAllCircle.target.onTouchEnd.Remove(AllCircleScoreStart);
-
-            double allCircleScore = 0;
-            if (_time >= ConstScoreSystem.LONG_PRESS_TIME)
-            {
-                allCircleScore = ScoreSystemData.Instance.GetAllCircleAddScore(_mainScore);
-            }
-            else
-            {
-                Timers.inst.Add(1f, 1, Skip);
-            }
 
-            _ui.m_comAllCircle.m_txtCount.text = ((int)Math.Round(allCircleScore)).ToString();
 
-            _time = 0;
-            _score += allCircleScore;
 
 
-        }
-
-        private void SetScoreUI()
-        {
-            EquipDataCache.cacher.totalScore = (int)Math.Round(_score);
-            _ui.m_proScore.m_txtCount.text = "总分 " + Math.Round(_score).ToString();
-            // _ui.m_proScore.target.TweenValue(_score, 0.2f);
-
-            double proportion = _score / _ui.m_proScore.target.max;
-            float width = (float)(proportion * _ui.m_proScore.target.width);
-            width = width > _ui.m_proScore.m_comBar.target.initWidth ? _ui.m_proScore.m_comBar.target.initWidth : width;
-            GTween.To(_ui.m_proScore.m_comBar.target.width, width, 0.5f).SetTarget(_ui.m_proScore.m_comBar).OnUpdate((GTweener t) =>
-                {
-                    _ui.m_proScore.m_comBar.target.width = t.value.x;
-                }); ;
-        }
         private void OnBtnSpeedUp()
         {
             EquipDataCache.cacher.fightSpeed = EquipDataCache.cacher.fightSpeed == 1 ? EquipDataCache.cacher.maxFightSpeed : 1;
@@ -358,61 +223,25 @@ namespace GFGGame
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
-            EventAgent.RemoveEventListener(ConstMessage.CARD_SKILL, CircleScoreStart);
+            EventAgent.RemoveEventListener(ConstMessage.CARD_SKILL, PartScoreStart);
         }
         private void Reset()
         {
-            _stopFight = true;
-            Timers.inst.Remove(SkillScoreStart);
+            // _stopFight = true;
+            Timers.inst.Remove(SkillScore);
             Timers.inst.Remove(Skip);
-            _ui.m_comAllCircle.target.visible = false;
-            _ui.m_comClickCircle.target.visible = false;
-            // _ui.m_comClickCircle.m_t0.Stop(true, false);
-            // _ui.m_comClickCircle.m_t1.Stop(true, false);
+
             _ui.m_proScore.target.value = 0;
-            // _ui.m_proScore.m_txtCount.text = "总分 0";
-            _gameObject2.SetActive(false);
-            // _ui.m_comClickCircle.m_ComScoreResult;// ComScoreResult
-            _ui.m_comClickCircle.m_ComScoreResult.target.visible = false;
-            GTween.Kill(_gameObject7);
-            GTween.Kill(_ui.m_proScore.m_comBar);
-            GTween.Kill(_ui.m_holderPartScore);
-        }
+            _ui.m_proScore.m_txtCount.text = "总分 0";
+            _ui.m_comClickCircle.target.SetScale(0, 0);
+            _ui.m_loaGlass.SetScale(0, 0);
+
+            // GTween.Kill(_ui.m_proScore.m_comBar);
 
-        private void PlayScoreTWEffect()
-        {
-            _ui.m_holderPartScore.visible = true;
-            Vector3 endVaule = _ui.m_proScore.target.position + new Vector3(_ui.m_proScore.m_comBar.target.width, 0, 0);
-            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(() =>
-            {
-                _ui.m_holderPartScore.visible = false;
-                SetScoreUI();
-            });
-        }
-        private void AddEffect()
-        {
-            string resPath0 = ResPathUtil.GetViewEffectPath("ui_zhandou", "zd_df_tw");
-            SceneController.AddObjectToView(_gameObject0, null, _ui.m_holderPartScore, resPath0, out _gameObject0, out _wrapper0);
-            string resPath1 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_jdt");
-            SceneController.AddObjectToView(_gameObject1, null, _ui.m_proScore.m_comBar.m_holder, resPath1, out _gameObject1, out _wrapper1);
-            string resPath2 = ResPathUtil.GetViewEffectPath("ui_zhandou", "zd_df_cheng");
-            SceneController.AddObjectToView(_gameObject2, null, _ui.m_comClickCircle.m_ComScoreResult.m_holder1, resPath2, out _gameObject2, out _wrapper2, 59);
-            // string resPath3_1 = ResPathUtil.GetViewEffectPath("ui_zhandou", "zd_df_lv");
-            // SceneController.AddObjectToView(_gameObject3, null, _ui.m_comClickCircle.m_ComScoreResult.m_holder, resPath3_1, out _gameObject3, out GoWrapper _wrapper3, 59);
-            // string resPath3_2 = ResPathUtil.GetViewEffectPath("ui_zhandou", "zd_df_sb");
-            // SceneController.AddObjectToView(_gameObject4, null, _ui.m_comClickCircle.m_ComScoreResult.m_holder2, resPath3_2, out _gameObject4, out GoWrapper _wrapper4, 59);
-            string resPath4 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_jdt_cz");
-            SceneController.AddObjectToView(_gameObject5, null, _ui.m_proScore.m_comBar.m_holder1, resPath4, out _gameObject5, out _wrapper5);
-            string resPath5 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_an_cz");
-            SceneController.AddObjectToView(_gameObject6, _wrapper6, _ui.m_comClickCircle.m_holder, resPath5, out _gameObject6, out _wrapper6);
-            string resPath6 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_an_sf");
-            SceneController.AddObjectToView(_gameObject7, _wrapper7, _ui.m_comClickCircle.m_holder1, resPath6, out _gameObject7, out _wrapper7);
-            string resPath7 = ResPathUtil.GetViewEffectPath("ui_zhandou", "zd_df_dfzj");
-            SceneController.AddObjectToView(_gameObject8, null, _ui.m_comAllCircle.m_holder, resPath7, out _gameObject8, out _wrapper8, 70);
         }
+
+
+
         protected override void OnHide()
         {
             base.OnHide();
@@ -428,31 +257,6 @@ namespace GFGGame
 
 
 
-        //********************************************************************************************************//
-
-        private int GetClickState()
-        {
-            float scaleX = _gameObject7.transform.localScale.x;// _ui.m_comClickCircle.m_imgCircle.scaleX;
-            int clickState = ScoreSystemData.MISS_CLICK;
-            if (EquipDataCache.cacher.autoPlay == true)
-            {
-                return ScoreSystemData.PREFACT_CLICK;
-            }
-            if (scaleX <= _prefectScale && scaleX > 40f)
-            {
-                clickState = ScoreSystemData.PREFACT_CLICK;
-                _prefectCount++;
-            }
-            else if (scaleX <= 20f)
-            {
-                clickState = ScoreSystemData.MISS_CLICK;
-            }
-            else
-            {
-                clickState = ScoreSystemData.GREAT_CLICK;
-            }
-            return clickState;
-        }
         private void CheckGuide(object param)
         {
             if (GuideDataManager.IsGuideFinish(ConstGuideId.SINGLE_FIGHT) <= 0)
@@ -470,7 +274,7 @@ namespace GFGGame
 
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
 
-            float scaleX = _gameObject7.transform.localScale.x;
+            float scaleX = 0;// _gameObject7.transform.localScale.x;
             if (scaleX == _prefectScale)
             {
                 bool isGuide = GuideController.TryGuide(_ui.m_comClickCircle.target, ConstGuideId.SINGLE_FIGHT, 9, "服饰比较繁琐，适当的整理会更加分，点击为各部位修整吧。");

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

@@ -43,7 +43,6 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            NTexture nTexture = this.viewData as NTexture;
             if (_sceneObject == null)
             {
                 _sceneObject = GameObject.Instantiate(_scenePrefab);
@@ -59,7 +58,7 @@ namespace GFGGame
             Timers.inst.Add(0.9f, 1, (object param) =>
             {
                 this.Hide();
-                ViewManager.Show(ViewName.STORY_FIGHT_SINGLE_SCORE_VIEW, nTexture);
+                ViewManager.Show(ViewName.STORY_FIGHT_SINGLE_SCORE_VIEW);
             });
         }
 

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

@@ -43,7 +43,7 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            NTexture nTexture = this.viewData as NTexture;
+
             if (_sceneObject == null)
             {
                 _sceneObject = GameObject.Instantiate(_scenePrefab);
@@ -61,7 +61,7 @@ namespace GFGGame
             Timers.inst.Add(1.1f, 1, (object param) =>
             {
                 this.Hide();
-                ViewManager.Show(ViewName.STORY_FIGHT_TARGET_SCORE_VIEW, nTexture);
+                ViewManager.Show(ViewName.STORY_FIGHT_TARGET_SCORE_VIEW);
             });
         }
 

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

@@ -65,65 +65,60 @@ namespace GFGGame
             _ui.m_btnClose.enabled = false;
             _ui.m_btnClose.onClick.Add(OnClickBtnClose);
 
-            string resPath = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_zdjs_jdt");
-            SceneController.AddObjectToView(_gameObject1, null, _ui.m_expBar.m_pbExp.m_holder, resPath, out _gameObject1, out _wrapper1);
+            _ui.m_loaBg.url = ResPathUtil.GetFightBgImgPath("zd_jsjm_bjtu");
+
         }
 
         protected override void OnShown()
         {
             base.OnShown();
             _resultData = (StoryFightResultData)this.viewData;
-            if (_sceneObject == null)
-            {
-                _sceneObject = GameObject.Instantiate(_scenePrefab);
-            }
+            // if (_sceneObject == null)
+            // {
+            //     _sceneObject = GameObject.Instantiate(_scenePrefab);
+            // }
             InstanceZonesDataManager.usedRecommend = false;
             InstanceZonesDataManager.isResultFighting = true;
-            SceneController.UpdateRole(EquipDataCache.cacher.equipDatas, _sceneObject);
+            // SceneController.UpdateRole(EquipDataCache.cacher.equipDatas, _sceneObject);
 
-            _ui.m_txtScore.text = "" + _resultData.Score;
-            _ui.m_expBar.m_txtLvl.text = "" + GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl);
-            StoryUtil.UpdateStar(_resultData.Star, _ui.m_flower.target);
+            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;
+            loaRole.SetSize(loaRole.width, loaRole.texture.height * loaRole.width / loaRole.texture.width);
 
-            string resPath = ResPathUtil.GetViewEffectPath("ui_zhandou", string.Format("zd_zdjs_{0}", _resultData.Star));
-            SceneController.AddObjectToView(_gameObject, _wrapper, _ui.m_holder, resPath, out _gameObject, out _wrapper, 120);
-            _ui.m_holder.visible = true;
-            _gameObject.SetActive(true);
+            _ui.m_comResult.m_c1.selectedIndex = _resultData.Star;
+            _ui.m_comResult.m_txtScore.text = "" + _resultData.Score;
+            _ui.m_comExpBar.m_txtLvl.text = string.Format("等级 {0}", GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl));
 
-            TextFormat tf = _ui.m_txtScore.textFormat;
             UpdateToCheckGuide(null);
 
-            _ui.m_c1.selectedIndex = 0;
             _levelCfg = StoryLevelCfgArray.Instance.GetCfg(InstanceZonesDataManager.currentLevelCfgId);
-            if (_levelCfg.type == ConstInstanceZonesType.Field)
-            {
-                _ui.m_c1.selectedIndex = 1;
-                Timers.inst.Add(3, 1, OnClickBtnClose);
-            }
+
 
             if (!this._resultData.Result)
             {
-                tf.font = "ui://Main/Font3";
-                _ui.m_expBar.m_txtLvlAdded.text = "0";
-                _ui.m_expBar.target.visible = false;
+                _ui.m_comExpBar.target.visible = false;
                 _ui.m_btnClose.enabled = true;
                 InstanceZonesDataManager.isResultFighting = false;
             }
             else
             {
-                tf.font = "ui://Main/Font2";
-                _ui.m_expBar.target.visible = true;
+                _ui.m_comExpBar.target.visible = true;
                 _ui.m_btnClose.enabled = false;
                 //过关
 
                 StoryFightCfg fightCfg = StoryFightCfgArray.Instance.GetCfg(_levelCfg.fightID);
-                _ui.m_expBar.m_txtLvlAdded.text = "" + fightCfg.exp;
+                _ui.m_comExpBar.m_txtLvlAdded.text = string.Format("经验值：+{0}", fightCfg.exp);
                 Timers.inst.Add(0.5f, 1, this.AddExp);
             }
-            _ui.m_txtScore.textFormat = tf;
-            _ui.m_t0.SetValue("posY", 33, this.viewCom.height - 235);
-            _ui.m_t0.Play();
 
+            if (_levelCfg.type == ConstInstanceZonesType.Field)
+            {
+                _ui.m_comExpBar.target.visible = false;
+                Timers.inst.Add(3, 1, OnClickBtnClose);
+            }
             Timers.inst.AddUpdate(CheckGuide);
         }
 
@@ -146,7 +141,6 @@ namespace GFGGame
             this.Hide();
             if (_levelCfg.type == ConstInstanceZonesType.Field)
             {
-                _ui.m_c1.selectedIndex = 1;
                 Timers.inst.Remove(OnClickBtnClose);
 
                 if (!this._resultData.Result || FieldDataManager.Instance.currFightLv == FieldCfgArray.Instance.GetCfg(FieldDataManager.Instance.chapterId).num)
@@ -179,19 +173,19 @@ namespace GFGGame
         private void AddExp(object param)
         {
             int lv = GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl);
-            _ui.m_expBar.m_txtLvl.text = lv.ToString();
+            _ui.m_comExpBar.m_txtLvl.text = string.Format("等级 {0}", GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl));
             float exp = GameGlobal.myNumericComponent.GetAsInt(NumericType.Exp);
             float cfgExp = RoleLevelCfgArray.Instance.GetCfg(lv).exp;
-            float initWidth = _ui.m_expBar.m_pbExp.m_bar.target.initWidth;
-            float curWidth = _ui.m_expBar.m_pbExp.m_bar.target.width;
+            float initWidth = _ui.m_comExpBar.m_pbExp.m_bar.target.initWidth;
+            float curWidth = _ui.m_comExpBar.m_pbExp.m_bar.target.width;
             float width = exp / cfgExp * initWidth;
             if (width <= curWidth)
             {
-                _ui.m_expBar.m_pbExp.m_bar.target.width = 0;
+                _ui.m_comExpBar.m_pbExp.m_bar.target.width = 0;
             }
-            GTween.To(_ui.m_expBar.m_pbExp.m_bar.target.width, width, 0.2f).SetTarget(_ui.m_expBar.m_pbExp.m_bar).OnUpdate((GTweener t) =>
+            GTween.To(_ui.m_comExpBar.m_pbExp.m_bar.target.width, width, 0.2f).SetTarget(_ui.m_comExpBar.m_pbExp.m_bar).OnUpdate((GTweener t) =>
                 {
-                    _ui.m_expBar.m_pbExp.m_bar.target.width = t.value.x;
+                    _ui.m_comExpBar.m_pbExp.m_bar.target.width = t.value.x;
                 }).OnComplete(() =>
                 {
                     InstanceZonesDataManager.isResultFighting = false;

GameClient/Assets/ResIn/Prefab/SceneDressUp.prefab

@@ -17,7 +17,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &4137215948490320690
 Transform:
   m_ObjectHideFlags: 0

GameClient/Assets/ResIn/UI/Main/Main_atlas_vuz5bw!a.png.meta → GameClient/Assets/ResIn/UI/Main/Main_atlas0_7!a.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 5fe8daefeffa6f84aaeb2ffe765c2b97
+guid: 945e4bd4ca303b348be29520ade9906a
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -32,9 +32,9 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
-    aniso: -1
-    mipBias: -100
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
     wrapU: 1
     wrapV: 1
     wrapW: 1

GameClient/Assets/ResIn/UI/Main/Main_atlas_vuz5bw.png.meta → GameClient/Assets/ResIn/UI/Main/Main_atlas0_7.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c0b3d0d8e36544949b0ab15ab96a67e5
+guid: 415aed2e96f5a104a9889c09b1f0cebd
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -32,9 +32,9 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
-    aniso: -1
-    mipBias: -100
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
     wrapU: 1
     wrapV: 1
     wrapW: 1