Merge branch 'master' of https://e.coding.net/shenyou-gfg/gfgclient/client

# Conflicts:
#	GameClient/Assets/Game/CSShare

FGUIProject/assets/DressUp/PhotographUI.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920" overflow="scroll" scroll="both">
+  <displayList>
+    <component id="n1_yd72" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
+    <loader id="n3_yd72" name="loaBg" xy="113,369" size="50,50"/>
+  </displayList>
+</component>

FGUIProject/assets/DressUp/package.xml

@@ -132,6 +132,7 @@
     <image id="oq7r45" name="hz_kuangxian.png" path="/images/"/>
     <image id="oq7r46" name="hz_tzkuang.png" path="/images/"/>
     <image id="oq7r47" name="hz_tzkuang_1.png" path="/images/"/>
+    <component id="be944a" name="PhotographUI.xml" path="/" exported="true"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\DressUp" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/LuckyBox/LuckyBoxCardUI.xml

@@ -4,7 +4,7 @@
     <graph id="n2_qdrt" name="bg" xy="0,0" size="1080,1920" alpha="0.4" type="rect" lineSize="0" fillColor="#ff000000">
       <relation target="" sidePair="width-width,height-height"/>
     </graph>
-    <component id="n0_qdrt" name="comCard" src="qdrt1a" fileName="ComCard.xml" xy="149,403" pivot="0.5,0.5" touchable="false">
+    <component id="n0_qdrt" name="comCard" src="qdrt1a" fileName="components/ComCard.xml" xy="66,475" pivot="0.5,0.5" touchable="false">
       <relation target="" sidePair="center-center,middle-middle"/>
     </component>
     <component id="n3_qdrt" name="btnPass" src="qdrt1c" fileName="components/Button4.xml" xy="863,1802">

FGUIProject/assets/LuckyBox/components/ComCard.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="782,1114">
+<component size="948,970">
   <displayList>
-    <loader id="n0_qdrt" name="bg" xy="0,0" size="782,1114" url="ui://drx9d1usqdrt14" autoSize="true"/>
-    <loader id="n1_qdrt" name="loaType" xy="517,310" size="57,224" url="ui://drx9d1usqdrt15" autoSize="true"/>
-    <loader id="n2_qdrt" name="loaIcon" xy="263,270" size="255,255" url="ui://mfvz4q8kkubi7e" fill="scaleMatchWidth"/>
-    <loader id="n3_qdrt" name="loaProperty" xy="613,209" size="58,58" url="ui://eg2y0ldp842s6k" autoSize="true"/>
-    <text id="n4_qdrt" name="txtName" xy="391,641" pivot="0.5,0.5" anchor="true" size="100,64" fontSize="48" color="#906942" text="服装"/>
-    <text id="n5_qdrt" name="txtDiscribe" xy="391,760" pivot="0.5,0" anchor="true" size="474,129" fontSize="34" color="#b19d7e" autoSize="none" text="赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王"/>
+    <loader id="n0_qdrt" name="bg" xy="0,0" size="948,970" url="ui://drx9d1usqdrt14" autoSize="true"/>
+    <loader id="n1_qdrt" name="loaType" xy="685,237" size="78,306" aspect="true" url="ui://drx9d1usqdrt15" fill="scaleMatchWidth"/>
+    <loader id="n2_qdrt" name="loaIcon" xy="287,206" size="374,374" aspect="true" url="ui://mfvz4q8kkubi7e" fill="scaleMatchWidth"/>
+    <loader id="n3_qdrt" name="loaProperty" xy="248,231" size="60,60" aspect="true" url="ui://eg2y0ldp842s6k" fill="scaleMatchWidth"/>
+    <text id="n4_qdrt" name="txtName" xy="474,75" pivot="0.5,0.5" anchor="true" size="100,64" fontSize="48" color="#feeac2" text="服装"/>
+    <text id="n5_qdrt" name="txtDiscribe" xy="474,656" pivot="0.5,0" anchor="true" size="360,235" fontSize="30" color="#c2a773" autoSize="height" text="赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王"/>
   </displayList>
 </component>

FGUIProject/assets/Main/FontScore/Font5.fnt

@@ -1,3 +1,4 @@
+info size=51 resizable=true colored=false
 char id=48 img=vuz59y xoffset=0 yoffset=0 xadvance=0
 char id=57 img=vuz59z xoffset=0 yoffset=0 xadvance=0
 char id=49 img=vuz5a0 xoffset=0 yoffset=0 xadvance=0

FGUIProject/assets/Main/FontScore/Font6.fnt

@@ -1,5 +1,6 @@
+info size=51 resizable=true colored=false
 char id=48 img=vuz5a8 xoffset=0 yoffset=0 xadvance=0
-char id=51 img=vuz5a9 xoffset=0 yoffset=0 xadvance=0
+char id=57 img=vuz5a9 xoffset=0 yoffset=0 xadvance=0
 char id=49 img=vuz5aa xoffset=0 yoffset=0 xadvance=0
 char id=50 img=vuz5ab xoffset=0 yoffset=0 xadvance=0
 char id=51 img=vuz5ac xoffset=0 yoffset=0 xadvance=0

FGUIProject/assets/Main/FontScore/Font8.fnt

@@ -1,3 +1,4 @@
+info size=67 resizable=true colored=false
 char id=48 img=vuz5as xoffset=0 yoffset=0 xadvance=0
 char id=49 img=vuz5at xoffset=0 yoffset=0 xadvance=0
 char id=50 img=vuz5au xoffset=0 yoffset=0 xadvance=0
@@ -8,3 +9,5 @@ char id=54 img=vuz5ay xoffset=0 yoffset=0 xadvance=0
 char id=55 img=vuz5az xoffset=0 yoffset=0 xadvance=0
 char id=56 img=vuz5b0 xoffset=0 yoffset=0 xadvance=0
 char id=57 img=vuz5b1 xoffset=0 yoffset=0 xadvance=0
+char id=43 img=v3k9ct xoffset=0 yoffset=15 xadvance=0
+char id=45 img=v3k9cu xoffset=0 yoffset=30 xadvance=0

FGUIProject/assets/Main/RoleInfoUI.xml

@@ -1,32 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="912,644">
+<component size="878,1044">
   <displayList>
-    <loader id="n0_d4iw" name="bg" xy="0,0" size="912,644" url="ui://mk0fwx0xq08x4" fill="scaleFree"/>
-    <image id="n3_d4iw" name="n3" src="ga16f" fileName="imagesExport/zx_jq_djdikbti.png" pkg="eg2y0ldp" xy="9,8"/>
-    <text id="n2_d4iw" name="txtTitle" xy="93,22" size="726,56" fontSize="42" color="#ffffff" align="center" autoSize="none" text="个人信息"/>
-    <component id="n4_d4iw" name="n4" src="kubi7h" fileName="components/CompHeadWithBg.xml" xy="70,136"/>
-    <text id="n5_d4iw" name="txtRoleName" xy="264,139" size="172,57" fontSize="42" color="#8781dd" text="角色名称"/>
-    <text id="n6_d4iw" name="n6" xy="264,209" size="60,39" fontSize="28" color="#8781dd" text="等级"/>
-    <text id="n7_d4iw" name="n7" xy="264,254" size="60,39" fontSize="28" color="#8781dd" text="经验"/>
-    <text id="n8_d4iw" name="txtLvl" xy="353,209" size="20,39" fontSize="28" color="#ababec" text="1"/>
-    <component id="n9_d4iw" name="proBarExp" src="d4iw6m" fileName="components/ProgressBarExp2.xml" xy="353,271" size="485,16">
-      <ProgressBar value="50" max="100"/>
+    <loader id="n0_d4iw" name="bg" xy="0,0" size="878,1044" url="ui://mfvz4q8kmhyhd5" fill="scaleFree" autoSize="true"/>
+    <image id="n23_mhyh" name="n23" src="mhyhd7" fileName="images/grxx_mzk_1.png" xy="287,313"/>
+    <text id="n2_d4iw" name="txtTitle" xy="93,22" size="726,56" visible="false" fontSize="42" color="#ffffff" align="center" autoSize="none" text="个人信息"/>
+    <component id="n4_d4iw" name="n4" src="kubi7h" fileName="components/CompHeadWithBg.xml" xy="377,86"/>
+    <text id="n5_d4iw" name="txtRoleName" xy="346,313" pivot="0.5,0" size="186,62" fontSize="46" color="#a37349" align="center" text="角色名五"/>
+    <text id="n6_d4iw" name="n6" xy="153,466" size="71,46" fontSize="34" color="#aa794d" text="等级"/>
+    <text id="n7_d4iw" name="n7" xy="153,526" size="71,46" fontSize="34" color="#aa794d" text="经验"/>
+    <text id="n8_d4iw" name="txtLvl" xy="257,466" size="25,46" fontSize="34" color="#c47a6c" text="1"/>
+    <component id="n9_d4iw" name="proBarExp" src="d4iw6m" fileName="components/ProgressBarExp2.xml" xy="248,534">
+      <ProgressBar value="100" max="100"/>
     </component>
-    <text id="n10_d4iw" name="n10" xy="73,363" size="76,49" fontSize="36" color="#8781dd" text="音效"/>
-    <component id="n11_d4iw" name="btnSound" src="d4iw6o" fileName="components/ButtonToggle.xml" xy="207,368"/>
-    <text id="n12_d4iw" name="n12" xy="513,363" size="76,49" fontSize="36" color="#8781dd" text="音乐"/>
-    <component id="n13_d4iw" name="btnMusic" src="d4iw6o" fileName="components/ButtonToggle.xml" xy="644,368"/>
-    <component id="n19_ga16" name="btnLogout" src="pal5w" fileName="components/Button4.xml" pkg="eg2y0ldp" xy="141,502">
+    <text id="n10_d4iw" name="n10" xy="153,586" size="71,46" fontSize="34" color="#aa794d" text="音效"/>
+    <component id="n11_d4iw" name="btnSound" src="d4iw6o" fileName="components/ButtonToggle.xml" xy="244,587"/>
+    <text id="n12_d4iw" name="n12" xy="505,586" size="71,46" fontSize="34" color="#aa794d" text="音乐"/>
+    <component id="n13_d4iw" name="btnMusic" src="d4iw6o" fileName="components/ButtonToggle.xml" xy="587,591"/>
+    <component id="n19_ga16" name="btnLogout" src="ih7594" fileName="components/Button10.xml" pkg="mk0fwx0x" xy="120,720" size="300,82" aspect="true">
       <Button title="注销账户"/>
     </component>
-    <component id="n14_d4iw" name="btnExit" src="pal5w" fileName="components/Button4.xml" pkg="eg2y0ldp" xy="522,502">
+    <component id="n14_d4iw" name="btnExit" src="ih7594" fileName="components/Button10.xml" pkg="mk0fwx0x" xy="430,720" size="300,82" aspect="true">
       <Button title="返回登录"/>
     </component>
-    <component id="n18_d4iw" name="btnHelp" src="d4iw6p" fileName="components/ButtonHelp.xml" xy="25,586">
+    <component id="n18_d4iw" name="btnHelp" src="d4iw6p" fileName="components/ButtonHelp.xml" xy="704,884">
       <Button title="?"/>
     </component>
-    <text id="n21_bx8o" name="txtVersion" xy="700,591" size="200,42" fontSize="30" color="#cccccc" align="right" autoSize="none" autoClearText="true" text="v 1.0.0">
+    <text id="n21_bx8o" name="txtVersion" xy="539,824" size="200,42" fontSize="30" color="#cccccc" align="right" autoSize="none" autoClearText="true" text="v 1.0.0">
       <relation target="" sidePair="left-left,top-top"/>
     </text>
+    <loader id="n24_mhyh" name="loaChangeName" xy="586,331" size="34,36" url="ui://mfvz4q8kmhyhd8" autoSize="true"/>
+    <image id="n25_mhyh" name="n25" src="mhyhd6" fileName="images/grxx_txtx.png" xy="336,86"/>
   </displayList>
 </component>

FGUIProject/assets/Main/StoryFightSingleScoreUI.xml

@@ -14,7 +14,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="proCount" src="vuz5bh" fileName="components/ProgressBar1.xml" xy="79,1796">
+    <component id="n33_vuz5" name="proScore" src="vuz5bh" fileName="components/ProgressBarSingleScore.xml" xy="79,1796">
       <relation target="" sidePair="bottom-bottom"/>
       <ProgressBar max="100"/>
     </component>

FGUIProject/assets/Main/StoryFightTargetScoreUI.xml

@@ -1,20 +1,61 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1920">
+<component size="1080,1920" designImage="ui://mfvz4q8kmza1c0">
   <displayList>
-    <component id="n0_8xpg" name="selfScore" src="8xpg4e" fileName="components/CompFightScore.xml" xy="133,843">
-      <relation target="" sidePair="center-center,middle-middle"/>
+    <image id="n36_v3k9" name="n36" src="v3k9cy" fileName="images/zd_jinengdi_1.png" xy="0,1619">
+      <relation target="" sidePair="bottom-bottom"/>
+    </image>
+    <component id="n2_8xpg" name="btnSkip" src="nmnb2x" fileName="componentsDialog/ButtonSkip.xml" xy="867,1769" visible="false">
+      <relation target="" sidePair="bottom-bottom"/>
     </component>
-    <component id="n1_8xpg" name="selfName" src="8xpg41" fileName="components/CompFightResultName.xml" xy="-28,1667">
+    <component id="n0_8xpg" name="selfScore" src="8xpg4e" fileName="components/CompFightScore.xml" xy="133,843" visible="false">
       <relation target="" sidePair="center-center,middle-middle"/>
     </component>
-    <component id="n4_8xpg" name="targetName" src="8xpg41" fileName="components/CompFightResultName.xml" xy="540,1667">
+    <component id="n6_8xpg" name="targetScore" src="8xpg4e" fileName="components/CompFightScore.xml" xy="707,843" visible="false">
       <relation target="" sidePair="center-center,middle-middle"/>
     </component>
-    <component id="n2_8xpg" name="btnSkip" src="nmnb2x" fileName="componentsDialog/ButtonSkip.xml" xy="867,1769">
+    <component id="n37_mhyh" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="52,142"/>
+    <component id="n28_uj53" name="proScore" src="v3k9c7" fileName="components/ProgressBarTargetScore.xml" xy="172,171">
+      <ProgressBar value="42" max="100"/>
+    </component>
+    <component id="n15_mza1" name="comMineCircle" src="v3k9cv" fileName="components/comMineCircle.xml" xy="350,641" pivot="0.5,0.5" anchor="true" visible="false"/>
+    <component id="n17_mza1" name="comTargetCircle" src="v3k9c4" fileName="components/comTargetCircle.xml" xy="730,641" pivot="0.5,0.5" anchor="true" visible="false"/>
+    <component id="n25_vbe8" name="ComShieldMine" src="v3k9c3" fileName="components/ComSkillShield.xml" xy="133,895"/>
+    <component id="n27_vbe8" name="ComShieldNpc" src="v3k9c3" fileName="components/ComSkillShield.xml" xy="712,895"/>
+    <component id="n24_vbe8" name="proMinusMine" src="mhyhd4" fileName="components/ProgressBar2.xml" xy="190,820">
+      <ProgressBar value="100" max="100"/>
+    </component>
+    <component id="n26_vbe8" name="proMinusNpc" src="mhyhd4" fileName="components/ProgressBar2.xml" xy="708,820">
+      <ProgressBar value="100" max="100"/>
+    </component>
+    <component id="n29_uj53" name="ComRoleSkillMineAdd" src="v3k9c1" fileName="components/ComRoleSkillScore.xml" xy="100,914"/>
+    <component id="n34_pcn0" name="ComRoleSkillMineMinus" src="v3k9c1" fileName="components/ComRoleSkillScore.xml" xy="100,914"/>
+    <component id="n33_uj53" name="ComRoleSkillNpcAdd" src="v3k9c1" fileName="components/ComRoleSkillScore.xml" xy="620,914"/>
+    <component id="n35_pcn0" name="ComRoleSkillNpcMinus" src="v3k9c1" fileName="components/ComRoleSkillScore.xml" xy="620,914"/>
+    <component id="n1_8xpg" name="selfName" src="8xpg41" fileName="components/CompFightResultName.xml" xy="48,1499">
       <relation target="" sidePair="bottom-bottom"/>
     </component>
-    <component id="n6_8xpg" name="targetScore" src="8xpg4e" fileName="components/CompFightScore.xml" xy="707,843">
-      <relation target="" sidePair="center-center,middle-middle"/>
+    <component id="n4_8xpg" name="targetName" src="8xpg41" fileName="components/CompFightResultName.xml" xy="596,1499">
+      <relation target="" sidePair="bottom-bottom"/>
+    </component>
+    <component id="n20_vbe8" name="btnSkill0" src="v3k9c0" fileName="components/ComBtnSkill.xml" xy="70,1682">
+      <relation target="" sidePair="bottom-bottom"/>
+      <property target="icon" propertyId="1" value="ui://mfvz4q8kv3k9cm"/>
+      <property target="icon1" propertyId="1" value="ui://mfvz4q8kv3k9cc"/>
+    </component>
+    <component id="n21_vbe8" name="btnSkill1" src="v3k9c0" fileName="components/ComBtnSkill.xml" xy="314,1682">
+      <relation target="" sidePair="bottom-bottom"/>
+      <property target="icon" propertyId="1" value="ui://mfvz4q8kv3k9cn"/>
+      <property target="icon1" propertyId="1" value="ui://mfvz4q8kv3k9cd"/>
+    </component>
+    <component id="n22_vbe8" name="btnSkill2" src="v3k9c0" fileName="components/ComBtnSkill.xml" xy="556,1682">
+      <relation target="" sidePair="bottom-bottom"/>
+      <property target="icon" propertyId="1" value="ui://mfvz4q8kv3k9co"/>
+      <property target="icon1" propertyId="1" value="ui://mfvz4q8kv3k9ce"/>
+    </component>
+    <component id="n23_vbe8" name="btnSkill3" src="v3k9c0" fileName="components/ComBtnSkill.xml" xy="800,1682">
+      <relation target="" sidePair="bottom-bottom"/>
+      <property target="icon" propertyId="1" value="ui://mfvz4q8kv3k9cp"/>
+      <property target="icon1" propertyId="1" value="ui://mfvz4q8kv3k9cf"/>
     </component>
   </displayList>
 </component>

FGUIProject/assets/Main/StoryLevelInfoUI.xml

@@ -1,53 +1,53 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1414" designImageOffsetX="-750">
+<component size="1080,1160" designImageOffsetX="-750">
   <controller name="ctrlNeed" pages="0,,1,,2," selected="0"/>
   <displayList>
-    <image id="n2_vxw5" name="n2" src="j48o94" fileName="images/zx_jq_dituditu.png" xy="0,0"/>
-    <component id="n0_vxw5" name="btnStart" src="t8o13i" fileName="componentsLevel/ButtonStart.xml" xy="766,1017">
+    <image id="n2_vxw5" name="n2" src="j48o94" fileName="images/zx_jq_dituditu.png" xy="0,-153"/>
+    <component id="n0_vxw5" name="btnStart" src="t8o13i" fileName="componentsLevel/ButtonStart.xml" xy="766,864">
       <Button title="开始旅程"/>
     </component>
-    <text id="n4_t8o1" name="txtTitle" xy="379,252" pivot="0.5,0" size="536,64" fontSize="48" color="#fdf4cb" align="center" autoSize="none" autoClearText="true" text="关卡标题"/>
-    <text id="n38_j48o" name="n38" xy="387,352" size="184,49" fontSize="36" color="#9b7f61" text="最高评分："/>
-    <text id="n39_j48o" name="n39" xy="387,427" size="184,49" fontSize="36" color="#9b7f61" text="通关属性："/>
-    <text id="n40_j48o" name="n40" xy="387,502" size="184,49" fontSize="36" color="#9b7f61" text="通关条件：">
+    <text id="n4_t8o1" name="txtTitle" xy="379,99" pivot="0.5,0" size="536,64" fontSize="48" color="#fdf4cb" align="center" autoSize="none" autoClearText="true" text="关卡标题"/>
+    <text id="n38_j48o" name="n38" xy="387,199" size="184,49" fontSize="36" color="#9b7f61" text="最高评分："/>
+    <text id="n39_j48o" name="n39" xy="387,274" size="184,49" fontSize="36" color="#9b7f61" text="通关属性："/>
+    <text id="n40_j48o" name="n40" xy="387,349" size="184,49" fontSize="36" color="#9b7f61" text="通关条件：">
       <gearDisplay controller="ctrlNeed" pages="1,2"/>
       <gearText controller="ctrlNeed" pages="2" values="通关加分：" default="通关条件："/>
     </text>
-    <text id="n7_t8o1" name="txtHighestScore" xy="580,358" size="226,57" fontSize="32" color="#a28d77" ubb="true" autoSize="none" autoClearText="true" text="9999"/>
-    <text id="n41_j48o" name="txtNeed" xy="580,505" size="132,44" fontSize="32" color="#a28d77" leading="10" ubb="true" autoClearText="true" text="赵钱孙李">
+    <text id="n7_t8o1" name="txtHighestScore" xy="580,205" size="226,57" fontSize="32" color="#a28d77" ubb="true" autoSize="none" autoClearText="true" text="9999"/>
+    <text id="n41_j48o" name="txtNeed" xy="580,352" size="132,44" fontSize="32" color="#a28d77" leading="10" ubb="true" autoClearText="true" text="赵钱孙李">
       <gearDisplay controller="ctrlNeed" pages="1"/>
     </text>
-    <list id="n42_j48o" name="listTag" xy="581,510" size="315,41" layout="row" colGap="10" defaultItem="ui://eg2y0ldpih7566" autoClearItems="true">
+    <list id="n42_j48o" name="listTag" xy="581,357" size="315,41" layout="row" colGap="10" defaultItem="ui://eg2y0ldpih7566" autoClearItems="true">
       <gearDisplay controller="ctrlNeed" pages="2"/>
       <item/>
       <item/>
     </list>
-    <text id="n15_t8o1" name="txtLevelDesc" xy="387,572" size="638,140" fontSize="32" color="#a28d77" leading="10" ubb="true" autoSize="none" autoClearText="true" text="旋律在指尖流转，在天幕中划出一道 起伏的星轨折线谱，爱与星光于此吟 唱。参与限时活动星幕下的奏鸣！"/>
-    <loader id="n16_t8o1" name="loaderHead" xy="210,155" pivot="0.5,0" anchor="true" size="332,558" url="ui://mfvz4q8kj48o96" autoSize="true" clearOnPublish="true"/>
-    <text id="n18_t8o1" name="txtPowerDesc" xy="822,1267" size="170,42" fontSize="28" color="#b19270" align="center" vAlign="middle" vars="true" autoSize="none" text="消耗体力{power=0}"/>
-    <image id="n34_pal5" name="n34" src="j48o97" fileName="images/zx_jq_rwbszik.png" xy="32,337"/>
-    <text id="n21_t8o1" name="txtTargetName" xy="43,362" pivot="0.5,0" size="32,212" fontSize="32" color="#dcc7b3" align="center" autoSize="height" text="挑战对手">
+    <text id="n15_t8o1" name="txtLevelDesc" xy="387,419" size="638,140" fontSize="32" color="#a28d77" leading="10" ubb="true" autoSize="none" autoClearText="true" text="旋律在指尖流转，在天幕中划出一道 起伏的星轨折线谱，爱与星光于此吟 唱。参与限时活动星幕下的奏鸣！"/>
+    <loader id="n16_t8o1" name="loaderHead" xy="210,2" pivot="0.5,0" anchor="true" size="332,558" url="ui://mfvz4q8kj48o96" autoSize="true" clearOnPublish="true"/>
+    <text id="n18_t8o1" name="txtPowerDesc" xy="822,1114" size="170,42" fontSize="28" color="#b19270" align="center" vAlign="middle" vars="true" autoSize="none" text="消耗体力{power=0}"/>
+    <image id="n34_pal5" name="n34" src="j48o97" fileName="images/zx_jq_rwbszik.png" xy="32,184"/>
+    <text id="n21_t8o1" name="txtTargetName" xy="43,209" pivot="0.5,0" size="32,212" fontSize="32" color="#dcc7b3" align="center" autoSize="height" text="挑战对手">
       <relation target="n34_pal5" sidePair="top-top"/>
     </text>
-    <component id="n19_t8o1" name="btnFightOnce" src="pal5w" fileName="components/Button4.xml" pkg="eg2y0ldp" xy="50,1087" group="n23_t8o1">
+    <component id="n19_t8o1" name="btnFightOnce" src="pal5w" fileName="components/Button4.xml" pkg="eg2y0ldp" xy="50,934" group="n23_t8o1">
       <Button title="挑战一次"/>
     </component>
-    <component id="n20_t8o1" name="btnFightTimes" src="pal5w" fileName="components/Button4.xml" pkg="eg2y0ldp" xy="396,1087" group="n23_t8o1">
+    <component id="n20_t8o1" name="btnFightTimes" src="pal5w" fileName="components/Button4.xml" pkg="eg2y0ldp" xy="396,934" group="n23_t8o1">
       <Button title="挑战十次"/>
     </component>
-    <group id="n23_t8o1" name="groupPass" xy="50,1087" size="660,105" advanced="true" layout="hz" colGap="32" excludeInvisibles="true">
+    <group id="n23_t8o1" name="groupPass" xy="50,934" size="660,105" advanced="true" layout="hz" colGap="32" excludeInvisibles="true">
       <relation target="n0_vxw5" sidePair="right-right"/>
     </group>
-    <text id="n22_t8o1" name="txtUnpassTips" xy="295,1121" pivot="0.5,0" size="364,49" group="n24_t8o1" fontSize="36" color="#fde3bc" align="center" vars="true" singleLine="true" text="{count=二}星及以上可快速通关"/>
-    <group id="n24_t8o1" name="groupUnpass" xy="295,1121" size="364,49" advanced="true"/>
-    <component id="n8_t8o1" name="flower" src="s2cc5k" fileName="components/CompFlower1.xml" xy="697,354">
+    <text id="n22_t8o1" name="txtUnpassTips" xy="295,968" pivot="0.5,0" size="364,49" group="n24_t8o1" fontSize="36" color="#fde3bc" align="center" vars="true" singleLine="true" text="{count=二}星及以上可快速通关"/>
+    <group id="n24_t8o1" name="groupUnpass" xy="295,968" size="364,49" advanced="true"/>
+    <component id="n8_t8o1" name="flower" src="s2cc5k" fileName="components/CompFlower1.xml" xy="697,201">
       <relation target="n7_t8o1" sidePair="left-left,top-top"/>
     </component>
-    <list id="n33_t8o1" name="listBonus" xy="0,745" size="1079,281" layout="row" scroll="horizontal" colGap="58" defaultItem="ui://eg2y0ldpj48o98" align="center" autoClearItems="true">
+    <list id="n33_t8o1" name="listBonus" xy="0,592" size="1079,281" layout="row" scroll="horizontal" colGap="58" defaultItem="ui://eg2y0ldpj48o98" align="center" autoClearItems="true">
       <item/>
       <item/>
       <item/>
     </list>
-    <loader id="n37_d4iw" name="scoreType" xy="581,425" size="50,50" url="ui://eg2y0ldp842s6h" fill="scale"/>
+    <loader id="n37_d4iw" name="scoreType" xy="581,272" size="50,50" url="ui://eg2y0ldp842s6h" fill="scale"/>
   </displayList>
 </component>

FGUIProject/assets/Main/components/ComAllScoreResult.xml

@@ -3,6 +3,6 @@
   <displayList>
     <image id="n34_vuz5" name="n34" src="vuz5b9" fileName="imagesStory/zd_pfanniu_4.png" xy="0,0"/>
     <image id="n35_vuz5" name="n35" src="vuz5bg" fileName="imagesStory/zd_pfziti_4.png" xy="63,107"/>
-    <text id="n36_vuz5" name="txtCount" xy="60,200" pivot="0.5,0" size="239,71" font="ui://mfvz4q8kvuz5b5" fontSize="12" text="66666"/>
+    <text id="n36_vuz5" name="txtCount" xy="62,200" pivot="0.5,0" size="234,69" font="ui://mfvz4q8kvuz5b5" fontSize="65" text="66666"/>
   </displayList>
 </component>

FGUIProject/assets/Main/components/ComBtnSkill.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="212,212">
+  <controller name="c1" pages="0,,1,,2," selected="0"/>
+  <displayList>
+    <loader id="n22_uxaj" name="icon" xy="106,106" pivot="0.5,0.5" anchor="true" size="212,212" aspect="true" url="ui://mfvz4q8kv3k9cp" fill="scaleMatchHeight" autoSize="true">
+      <gearDisplay controller="c1" pages="0"/>
+    </loader>
+    <loader id="n28_v3k9" name="icon1" xy="106,106" pivot="0.5,0.5" anchor="true" size="212,212" aspect="true" url="ui://mfvz4q8kv3k9cc" fill="scaleMatchHeight" autoSize="true">
+      <gearDisplay controller="c1" pages="1,2"/>
+    </loader>
+    <component id="n24_vbe8" name="proCD" src="v3k9c5" fileName="components/ProgressBarCD.xml" xy="-14,-14">
+      <gearDisplay controller="c1" pages="1"/>
+      <ProgressBar value="59" max="100"/>
+    </component>
+    <image id="n26_v3k9" name="n26" src="v3k9ck" fileName="imagesStory/zd_txiao_1.png" xy="-22,-22" pivot="0.5,0.5">
+      <gearDisplay controller="c1" pages="0"/>
+    </image>
+    <image id="n27_v3k9" name="n27" src="v3k9cl" fileName="imagesStory/zd_txiao_2.png" xy="-22,-22" pivot="0.5,0.5">
+      <gearDisplay controller="c1" pages="0"/>
+    </image>
+  </displayList>
+  <transition name="t0" autoPlay="true" autoPlayRepeat="-1">
+    <item time="0" type="Alpha" target="n26_v3k9" tween="true" startValue="1" endValue="0.5" duration="9" ease="Linear"/>
+    <item time="9" type="Alpha" target="n26_v3k9" tween="true" startValue="0.5" endValue="1" duration="9" ease="Linear"/>
+  </transition>
+  <customProperty target="icon" propertyId="1"/>
+  <customProperty target="icon1" propertyId="1"/>
+</component>

FGUIProject/assets/Main/components/ComRoleSkill.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="360,360">
+  <controller name="c1" pages="0,,1," selected="1"/>
+  <displayList>
+    <image id="n30_v3k9" name="n30" src="v3k9cb" fileName="imagesStory/zd_jinengdi_1.png" xy="0,0"/>
+    <text id="n29_uj53" name="txtScore" xy="180,205" pivot="0.5,0" anchor="true" size="231,59" font="ui://mfvz4q8kvuz5b5" fontSize="55" color="#5dd05d" vars="true" text="-{count=10086}">
+      <gearText controller="c1" pages="0,1" values="+{count=9000}|-{count=10086}"/>
+    </text>
+    <image id="n31_v3k9" name="n31" src="v3k9cg" fileName="imagesStory/zd_jnsxzi_1.png" xy="79,101">
+      <gearDisplay controller="c1" pages="0"/>
+    </image>
+    <image id="n32_v3k9" name="n32" src="v3k9ch" fileName="imagesStory/zd_jnsxzi_2.png" xy="79,101">
+      <gearDisplay controller="c1" pages="1"/>
+    </image>
+  </displayList>
+</component>

FGUIProject/assets/Main/components/ComRoleSkillScore.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="360,360">
+  <displayList>
+    <component id="n30_v3k9" name="comRoleSkill" src="v3k9cx" fileName="components/ComRoleSkill.xml" xy="180,180" pivot="0.5,0.5" anchor="true"/>
+  </displayList>
+  <transition name="t0">
+    <item time="0" type="Pivot" target="n30_v3k9" value="0.5,0.5"/>
+    <item time="0" type="Scale" target="n30_v3k9" tween="true" startValue="1.5,1.5" endValue="1,1" duration="12" ease="Bounce.Out"/>
+    <item time="0" type="Visible" target="n30_v3k9" value="true"/>
+    <item time="0" type="XY" target="n30_v3k9" value="180,180"/>
+    <item time="18" type="Visible" target="n30_v3k9" value="false"/>
+  </transition>
+  <transition name="t1">
+    <item time="0" type="Pivot" target="n30_v3k9" value="0,1"/>
+    <item time="0" type="Visible" target="n30_v3k9" value="true"/>
+    <item time="0" type="XY" target="n30_v3k9" value="0,360"/>
+    <item time="6" type="Rotation" target="n30_v3k9" tween="true" startValue="0" endValue="15" duration="6" ease="Bounce.Out"/>
+    <item time="18" type="Visible" target="n30_v3k9" value="false"/>
+  </transition>
+</component>

FGUIProject/assets/Main/components/ComScoreResult.xml

@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="256,259">
-  <controller name="c1" pages="0,,1,,2," selected="0"/>
+  <controller name="c1" pages="0,,1,,2," selected="2"/>
   <displayList>
-    <loader id="n7_vuz5" name="loaBg" xy="0,0" size="256,259" url="ui://mfvz4q8kvuz5b8" autoSize="true">
+    <loader id="n7_vuz5" name="loaBg" xy="0,0" size="256,259" url="ui://mfvz4q8kvuz5b7" autoSize="true">
       <gearIcon controller="c1" pages="0,1" values="ui://mfvz4q8kvuz5b8|ui://mfvz4q8kvuz5b6" default="ui://mfvz4q8kvuz5b7"/>
     </loader>
-    <loader id="n8_vuz5" name="loaType" xy="69,54" size="118,63" url="ui://mfvz4q8kvuz5bf" autoSize="true">
+    <loader id="n8_vuz5" name="loaType" xy="69,54" size="119,63" url="ui://mfvz4q8kvuz5be" autoSize="true">
       <gearIcon controller="c1" pages="0,1" values="ui://mfvz4q8kvuz5bf|ui://mfvz4q8kvuz5bd" default="ui://mfvz4q8kvuz5be"/>
     </loader>
-    <text id="n9_vuz5" name="txtCount0" xy="15,129" pivot="0.5,0" size="226,55" font="ui://mfvz4q8kvuz5b4" fontSize="12" align="center" text="666666">
+    <text id="n9_vuz5" name="txtCount0" xy="15,129" pivot="0.5,0" size="226,55" font="ui://mfvz4q8kvuz5b4" fontSize="51" align="center" text="666666">
       <gearDisplay controller="c1" pages="0"/>
     </text>
-    <text id="n10_vuz5" name="txtCount1" xy="15,129" pivot="0.5,0" size="226,55" font="ui://mfvz4q8kvuz5b2" fontSize="12" align="center" text="666666">
+    <text id="n10_vuz5" name="txtCount1" xy="15,129" pivot="0.5,0" size="226,55" font="ui://mfvz4q8kvuz5b2" fontSize="51" align="center" text="666666">
       <gearDisplay controller="c1" pages="1"/>
     </text>
-    <text id="n11_vuz5" name="txtCount2" xy="15,129" pivot="0.5,0" size="226,55" font="ui://mfvz4q8kvuz5b3" fontSize="12" align="center" text="666666">
+    <text id="n11_vuz5" name="txtCount2" xy="15,129" pivot="0.5,0" size="226,55" font="ui://mfvz4q8kvuz5b3" fontSize="51" align="center" text="666666">
       <gearDisplay controller="c1" pages="2"/>
     </text>
   </displayList>

FGUIProject/assets/Main/components/ComSkillShield.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="244,237">
+  <displayList>
+    <image id="n25_vbe8" name="img" src="8xpg3z" fileName="imagesStory/zd_drpf_fsz_1.png" xy="0,0"/>
+  </displayList>
+</component>

FGUIProject/assets/Main/components/CompFightResultName.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="540,78">
+<component size="442,78">
   <displayList>
     <image id="n1_8xpg" name="n1" src="8xpg40" fileName="imagesStory/zd_pf_zidi_1.png" xy="0,0"/>
-    <text id="n3_8xpg" name="txtName" xy="137,13" size="308,52" fontSize="38" color="#ffffff" align="center" autoSize="none" autoClearText="true" text="名字五个字"/>
+    <text id="n3_8xpg" name="txtName" xy="67,8" size="308,56" fontSize="42" color="#fff5d8" align="center" autoSize="none" autoClearText="true" text="名字五个字"/>
   </displayList>
 </component>

FGUIProject/assets/Main/components/ProgressBar1.xml

@@ -4,12 +4,14 @@
     <image id="n0_vuz5" name="n0" src="vuz5ba" fileName="imagesStory/zd_pfjdt_1.png" xy="0,0">
       <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" fillMethod="hz" fillAmount="38"/>
+    <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="imgCurScore" src="vuz5bc" fileName="imagesStory/zd_pfjdt_3.png" xy="0,-12" pivot="0.5,0" anchor="true"/>
-    <image id="n4_oixc" name="imgFirstScore" src="oixcby" fileName="imagesStory/zd_pfjdt_4.png" xy="0,-11" pivot="0.5,0" anchor="true"/>
+    <image id="n3_vuz5" name="ani" src="vuz5bc" fileName="imagesStory/zd_pfjdt_3.png" xy="933,-12">
+      <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"/>
   </displayList>
   <ProgressBar titleType="value"/>
 </component>

FGUIProject/assets/Main/components/ProgressBar2.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="181,16" extention="ProgressBar">
+  <ProgressBar/>
+  <displayList>
+    <image id="n0_mhyh" src="v3k9d0" name="n0" xy="0,0" size="181,16">
+      <relation target="" sidePair="width,height"/>
+    </image>
+    <image id="n1_mhyh" src="v3k9d1" name="bar" xy="0,2" size="181,12"/>
+  </displayList>
+</component>

FGUIProject/assets/Main/components/ProgressBarCD.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="240,240" extention="ProgressBar">
+  <displayList>
+    <image id="n2_v3k9" name="n2" src="v3k9ca" fileName="imagesStory/zd_daoshu_2.png" xy="14,14"/>
+    <image id="n1_vbe8" name="bar" src="v3k9c9" fileName="imagesStory/zd_daoshu_1.png" xy="14,14" color="#f1ddba" fillMethod="radial360" fillOrigin="1" fillClockwise="false">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+  </displayList>
+  <ProgressBar/>
+</component>

FGUIProject/assets/Main/components/ProgressBarExp2.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="50,16" extention="ProgressBar">
+<component size="443,22" extention="ProgressBar">
   <displayList>
-    <image id="n0_d4iw" name="n0" src="d4iw6g" fileName="images/grxx_jyt_1.png" xy="0,0" size="50,16">
+    <image id="n0_d4iw" name="n0" src="d4iw6g" fileName="images/grxx_jyt_1.png" xy="-2,-2">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <image id="n1_d4iw" name="bar" src="d4iw6h" fileName="images/grxx_jyt_2.png" xy="0,0" size="50,16"/>
-    <text id="n2_d4iw" name="title" xy="0,-6" size="50,29" fontSize="18" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="">
+    <image id="n1_d4iw" name="bar" src="d4iw6h" fileName="images/grxx_jyt_2.png" xy="0,0" size="443,22" fillMethod="hz"/>
+    <text id="n2_d4iw" name="title" xy="0,-6" size="443,35" fontSize="24" color="#fff6ee" align="center" vAlign="middle" autoSize="none" text="100/850">
       <relation target="" sidePair="width-width,height-height"/>
     </text>
   </displayList>

FGUIProject/assets/Main/components/ProgressBarSingleScore.xml

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

FGUIProject/assets/Main/components/ProgressBarTargetScore.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="852,30" extention="ProgressBar">
+  <displayList>
+    <image id="n0_uj53" name="n0" src="vuz5ba" fileName="imagesStory/zd_pfjdt_1.png" xy="0,0" size="852,30">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <image id="n7_v3k9" name="n7" src="v3k9cs" fileName="imagesStory/zd_zdjdt_3.png" xy="0,-1"/>
+    <image id="n1_uj53" name="bar" src="v3k9cr" fileName="imagesStory/zd_zdjdt_2.png" xy="0,-1"/>
+    <text id="n4_uj53" name="txtMineScore" xy="60,-7" size="138,39" fontSize="28" color="#fff6ee" vAlign="middle" autoSize="none" text="总分：10086">
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+    <text id="n5_uj53" name="txtNpcScore" xy="620,-7" pivot="1,0" size="175,39" fontSize="28" color="#fff6ee" align="right" vAlign="middle" text="敌方：10086">
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+    <image id="n6_uj53" name="ani" src="vuz5bc" fileName="imagesStory/zd_pfjdt_3.png" xy="836,-13" size="32,56">
+      <relation target="n1_uj53" sidePair="right-right"/>
+    </image>
+  </displayList>
+  <ProgressBar/>
+</component>

FGUIProject/assets/Main/components/comMineCircle.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="256,256">
+  <displayList>
+    <loader id="n16_v3k9" name="loaIcon" xy="0,-1" size="256,259" url="ui://mfvz4q8kvuz5b6" autoSize="true"/>
+    <text id="n17_v3k9" name="txtPart" xy="128,78" pivot="0.5,0.5" anchor="true" size="124,79" fontSize="60" color="#fdfbee" align="center" text="饰品"/>
+    <text id="n15_mza1" name="txtCount" xy="0,124" pivot="0.5,0.5" size="256,60" font="ui://mfvz4q8kvuz5b2" fontSize="56" align="center" vAlign="middle" autoSize="none" text="999"/>
+  </displayList>
+  <transition name="t0">
+    <item time="0" type="Alpha" target="n16_v3k9" tween="true" startValue="0" endValue="1" duration="6" ease="Linear"/>
+    <item time="0" type="Rotation" target="n17_v3k9" value="0"/>
+    <item time="0" type="Size" target="n15_mza1" value="10,60"/>
+    <item time="0" type="Skew" target="n17_v3k9" value="90,0"/>
+    <item time="6" type="Rotation" target="n17_v3k9" tween="true" startValue="-15" endValue="0" duration="3" ease="Linear"/>
+    <item time="6" type="Skew" target="n17_v3k9" tween="true" startValue="90,0" endValue="0,0" duration="3" ease="Linear"/>
+    <item time="10" type="Size" target="n15_mza1" tween="true" startValue="10,60" endValue="256,60" duration="8" ease="Linear"/>
+    <item time="48" type="Alpha" target="n16_v3k9" value="1"/>
+  </transition>
+</component>

FGUIProject/assets/Main/components/comTargetCircle.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="256,256">
+  <displayList>
+    <loader id="n16_v3k9" name="loaIcon" xy="0,-1" size="256,259" url="ui://mfvz4q8kvuz5b7" autoSize="true"/>
+    <text id="n17_v3k9" name="txtPart" xy="128,78" pivot="0.5,0.5" anchor="true" size="124,79" fontSize="60" color="#fdfbee" align="center" text="饰品"/>
+    <text id="n15_mza1" name="txtCount" xy="0,124" pivot="0.5,0.5" size="256,60" font="ui://mfvz4q8kvuz5b3" fontSize="56" align="center" vAlign="middle" autoSize="none" text="999"/>
+  </displayList>
+  <transition name="t0">
+    <item time="0" type="Alpha" target="n16_v3k9" tween="true" startValue="0" endValue="1" duration="6" ease="Linear"/>
+    <item time="0" type="Rotation" target="n17_v3k9" value="0"/>
+    <item time="0" type="Size" target="n15_mza1" value="10,60"/>
+    <item time="0" type="Skew" target="n17_v3k9" value="90,0"/>
+    <item time="6" type="Rotation" target="n17_v3k9" tween="true" startValue="15" endValue="0" duration="3" ease="Linear"/>
+    <item time="6" type="Skew" target="n17_v3k9" tween="true" startValue="-90,0" endValue="0,0" duration="3" ease="Linear"/>
+    <item time="10" type="Size" target="n15_mza1" tween="true" startValue="10,60" endValue="256,60" duration="4" ease="Linear"/>
+    <item time="18" type="Alpha" target="n16_v3k9" value="1"/>
+  </transition>
+</component>

FGUIProject/assets/Main/package.xml

@@ -158,8 +158,8 @@
     <component id="s2cc5q" name="CompChapter4.xml" path="/componentsLevel/" exported="true"/>
     <image id="d4iw5r" name="zx_jq_fskuang_2.png" path="/imagesStory/"/>
     <image id="d4iw5s" name="zx_jq_fskuang_1.png" path="/imagesStory/"/>
-    <image id="d4iw6g" name="grxx_jyt_1.png" path="/images/" scale="9grid" scale9grid="4,4,8,8"/>
-    <image id="d4iw6h" name="grxx_jyt_2.png" path="/images/" scale="9grid" scale9grid="4,4,8,8"/>
+    <image id="d4iw6g" name="grxx_jyt_1.png" path="/images/" scale="9grid" scale9grid="19,0,410,26"/>
+    <image id="d4iw6h" name="grxx_jyt_2.png" path="/images/" scale="9grid" scale9grid="12,0,420,21"/>
     <image id="d4iw6i" name="grxx_yx_dk.png" path="/images/"/>
     <image id="d4iw6j" name="grxx_yx_gb.png" path="/images/"/>
     <component id="d4iw6k" name="RoleInfoUI.xml" path="/" exported="true"/>
@@ -321,10 +321,53 @@
     <movieclip id="vuz5bq" name="MovieClip1.jta" path="/Movie/"/>
     <component id="vuz5bu" name="ComAllScoreResult.xml" path="/components/"/>
     <image id="vuz5bv" name="zd_pfhd_4.png" path="/Movie/"/>
-    <movieclip id="vuz5bw" name="MovieClip2.jta" path="/Movie/"/>
+    <movieclip id="vuz5bw" name="MovieClip2.jta" path="/Movie/" atlas="alone_npot"/>
     <component id="vuz5bx" name="Slider1_grip.xml" path="/components/"/>
     <image id="oixcby" name="zd_pfjdt_4.png" path="/imagesStory/"/>
     <image id="oixcbz" name="zd_ztca.png" path="/imagesStory/"/>
+    <component id="v3k9c0" name="ComBtnSkill.xml" path="/components/"/>
+    <component id="v3k9c1" name="ComRoleSkillScore.xml" path="/components/"/>
+    <component id="v3k9c3" name="ComSkillShield.xml" path="/components/"/>
+    <component id="v3k9c4" name="comTargetCircle.xml" path="/components/"/>
+    <component id="v3k9c5" name="ProgressBarCD.xml" path="/components/"/>
+    <component id="v3k9c6" name="ProgressBarSingleScore.xml" path="/components/"/>
+    <component id="v3k9c7" name="ProgressBarTargetScore.xml" path="/components/"/>
+    <image id="v3k9c8" name="f08dc01e397bcd8d2e04da1517d6cf7.png" path="/imagesStory/"/>
+    <image id="v3k9c9" name="zd_daoshu_1.png" path="/imagesStory/"/>
+    <image id="v3k9ca" name="zd_daoshu_2.png" path="/imagesStory/"/>
+    <image id="v3k9cb" name="zd_jinengdi_1.png" path="/imagesStory/"/>
+    <image id="v3k9cc" name="zd_jineng_1.png" path="/imagesStory/"/>
+    <image id="v3k9cd" name="zd_jineng_2.png" path="/imagesStory/"/>
+    <image id="v3k9ce" name="zd_jineng_3.png" path="/imagesStory/"/>
+    <image id="v3k9cf" name="zd_jineng_4.png" path="/imagesStory/"/>
+    <image id="v3k9cg" name="zd_jnsxzi_1.png" path="/imagesStory/"/>
+    <image id="v3k9ch" name="zd_jnsxzi_2.png" path="/imagesStory/"/>
+    <image id="v3k9ci" name="zd_jnsxzi_3.png" path="/imagesStory/"/>
+    <image id="v3k9cj" name="zd_jnsxzi_4.png" path="/imagesStory/"/>
+    <image id="v3k9ck" name="zd_txiao_1.png" path="/imagesStory/"/>
+    <image id="v3k9cl" name="zd_txiao_2.png" path="/imagesStory/"/>
+    <image id="v3k9cm" name="zd_xzjineng_1.png" path="/imagesStory/"/>
+    <image id="v3k9cn" name="zd_xzjineng_2.png" path="/imagesStory/"/>
+    <image id="v3k9co" name="zd_xzjineng_3.png" path="/imagesStory/"/>
+    <image id="v3k9cp" name="zd_xzjineng_4.png" path="/imagesStory/"/>
+    <image id="v3k9cq" name="zd_zdjdt_1.png" path="/imagesStory/"/>
+    <image id="v3k9cr" name="zd_zdjdt_2.png" path="/imagesStory/"/>
+    <image id="v3k9cs" name="zd_zdjdt_3.png" path="/imagesStory/"/>
+    <image id="v3k9ct" name="zd_zijia.png" path="/FontScore/"/>
+    <image id="v3k9cu" name="zd_zijian.png" path="/FontScore/"/>
+    <component id="v3k9cv" name="comMineCircle.xml" path="/components/"/>
+    <component id="v3k9cx" name="ComRoleSkill.xml" path="/components/"/>
+    <image id="v3k9cy" name="zd_jinengdi_1.png" path="/images/"/>
+    <image id="v3k9cz" name="zd_mcdi.png" path="/imagesStory/"/>
+    <image id="v3k9d0" name="zd_xpfjdt_1.png" path="/imagesStory/"/>
+    <image id="v3k9d1" name="zd_xpfjdt_2.png" path="/imagesStory/"/>
+    <image id="v3k9d2" name="zd_zijia.png" path="/imagesStory/"/>
+    <image id="v3k9d3" name="zd_zijian.png" path="/imagesStory/"/>
+    <component id="mhyhd4" name="ProgressBar2.xml" path="/components/"/>
+    <image id="mhyhd5" name="grxx_dikuang.png" path="/images/"/>
+    <image id="mhyhd6" name="grxx_txtx.png" path="/images/"/>
+    <image id="mhyhd7" name="grxx_mzk_1.png" path="/images/"/>
+    <image id="mhyhd8" name="grxx_mzk_2.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

GameClient/Assets/Editor/Excel/CodeBuilder.cs

@@ -120,6 +120,11 @@ namespace GFGEditor
                     _assignmentBuilder.AppendFormat("\t\t\t{0} = ConfigUtil.GetInt(reader.GetString(reader.GetOrdinal(\"_{1}\")));", name, name);
                     _assignmentBuilder.AppendLine();
                 }
+                else if (type == "float")
+                {
+                    _assignmentBuilder.AppendFormat("\t\t\t{0} = ConfigUtil.GetFloat(reader.GetString(reader.GetOrdinal(\"_{1}\")));", name, name);
+                    _assignmentBuilder.AppendLine();
+                }
                 else if (type == "string")
                 {
                     _assignmentBuilder.AppendFormat("\t\t\t{0} = reader.GetString(reader.GetOrdinal(\"_{1}\"));", name, name);

GameClient/Assets/Editor/ToolsMenu.cs

@@ -59,7 +59,7 @@ namespace GFGEditor
         {
             EditorUtility.DisplayProgressBar("进度", "正在更新至内网", 1);
             VEngine.Editor.Builds.BuildScript.BuildCustomBundles(new string[] { "Res", "ResIn" });
-            CommitAll();
+            //CommitAll();
             EditorUtility.ClearProgressBar();
             EditorUtility.DisplayDialog("提示", "操作成功！", "ok");//记得切出再切回编辑器焦点重新编译
         }

GameClient/Assets/Editor/Xasset/Builds/BuildTask.cs

@@ -9,7 +9,6 @@ namespace VEngine.Editor.Builds
     public class BuildTask
     {
         private readonly string[] EXCLUDE_EXTS = new string[] { ".meta" };
-        private readonly string[] EXCLUDE_DIRS = new string[] { "Assets/Res/.svn" };
         private readonly BuildAssetBundleOptions buildAssetBundleOptions;
         private readonly List<Asset> bundledAssets = new List<Asset>();
         private readonly string bundleExtension;
@@ -90,10 +89,7 @@ namespace VEngine.Editor.Builds
             var path = Path.Combine(Application.dataPath, resRootDirName);
             var buildSetting = GFGEditor.BuildSetting.GetBuildSetting();
             var dirBundleList = buildSetting.dirBundleList;
-            var excludeDirs = dirBundleList.GetRange(0, dirBundleList.Count);
-            excludeDirs.AddRange(EXCLUDE_DIRS);
-            //检测单个文件打包
-            GFGEditor.FileUtil.ForeachFileInDir(path, excludeDirs, (string file) =>
+            GFGEditor.FileUtil.ForeachFileInDir(path, dirBundleList, (string file) =>
             {
                 var ext = Path.GetExtension(file);
                 if (Array.IndexOf(EXCLUDE_EXTS, ext) < 0)
@@ -116,7 +112,6 @@ namespace VEngine.Editor.Builds
                 }
 
             });
-            //检测按文件夹打包
             foreach (var dir in dirBundleList)
             {
                 var dirPath = Path.Combine(Environment.CurrentDirectory, dir);

GameClient/Assets/Game/HotUpdate/Constant/ConstMessage.cs

@@ -22,6 +22,8 @@ namespace GFGGame
 
         public const string PLAT_CARDFOSTER_T1 = "PLAT_CARDFOSTER_T0";
 
+        public const string CLOSE_PHOTOGRAPHVIEW = "CLOSE_PHOTOGRAPHVIEW";
+
 
     }
 }

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

@@ -90,8 +90,6 @@ namespace GFGGame
         /// 部件评分
         /// </summary>
         /// <param name="partId">评分部位</param>
-        /// <param name="clickState">点击状态</param>
-        /// <param name="mainScore">总主属性</param>
         /// <returns></returns>
         public double GetPartBaseScore(int partId)
         {
@@ -128,7 +126,7 @@ namespace GFGGame
         }
         public double GetPartItemScore(int partId)
         {
-            return GetPartBaseScore(partId) * ConstScoreSystem.PART_SCORE; ;
+            return GetPartBaseScore(partId) * ConstScoreSystem.PART_SCORE;
         }
         public double GetPartItemClickScore(double mainScore, int clickState)
         {
@@ -153,11 +151,11 @@ namespace GFGGame
         {
             skillScore = 0;
             showCard = false;
-            SkillScoreCfg[] cfgs = SkillScoreCfgArray.Instance.GetCfgs(StoryDataManager.currentCardId);
+            PassivitySkillCfg[] cfgs = PassivitySkillCfgArray.Instance.GetCfgs(StoryDataManager.currentCardId);
             for (int i = 0; i < cfgs.Length; i++)
             {
                 if (cfgs.Length == 0) break;
-                SkillScoreCfg cfg = cfgs[i];
+                PassivitySkillCfg cfg = cfgs[i];
                 if (partId == cfg.subTypes || cfg.subTypes == 0)
                 {
                     int isProbability = Random.Range(0, 100) < cfg.probability ? 1 : 0;
@@ -188,9 +186,9 @@ namespace GFGGame
         /// </summary>
         /// <param name="cardId"></param>
         /// <returns></returns>
-        public SkillScoreCfg GetShowSkillCfg(int cardId)
+        public PassivitySkillCfg GetShowSkillCfg(int cardId)
         {
-            SkillScoreCfg[] cfgs = SkillScoreCfgArray.Instance.GetCfgs(cardId);
+            PassivitySkillCfg[] cfgs = PassivitySkillCfgArray.Instance.GetCfgs(cardId);
             if (cfgs.Length == 0)
             {
                 Debug.LogWarning(cardId + " 这张卡片没有配置技能");
@@ -212,9 +210,9 @@ namespace GFGGame
         /// </summary>
         /// <param name="cardId"></param>
         /// <returns></returns>
-        public SkillScoreCfg GetMainSkillCfg(int cardId)
+        public PassivitySkillCfg GetMainSkillCfg(int cardId)
         {
-            SkillScoreCfg[] cfgs = SkillScoreCfgArray.Instance.GetCfgs(cardId);
+            PassivitySkillCfg[] cfgs = PassivitySkillCfgArray.Instance.GetCfgs(cardId);
             if (cfgs.Length == 0)
             {
                 Debug.LogWarning(cardId + " 这张卡片没有配置技能");

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

@@ -1,9 +1,17 @@
 using System.Collections.Generic;
+using UnityEngine;
 
 namespace GFGGame
 {
     public class SkillDataManager : SingletonBase<SkillDataManager>
     {
+        public const int MINE = 0;
+        public const int NPC = 1;
+        public const string SKILL_ADD = "add";
+        public const string SKILL_MINUS = "minus";
+        public const string SKILL_BREAK = "break";
+        public const string SKILL_SHIELD = "shield";
+
         public Dictionary<int, SkillData> skillData = new Dictionary<int, SkillData>();
 
         public void Clear()
@@ -33,5 +41,20 @@ namespace GFGGame
             }
             skillData[skillId].lv += 1;
         }
+
+        //获取npc释放技能顺序
+        public Dictionary<int, RoleSkillCfg> GetNpcSkill()
+        {
+            Dictionary<int, RoleSkillCfg> npcSkillDic = new Dictionary<int, RoleSkillCfg>();
+            RoleSkillCfg[] roleSkillCfgs = RoleSkillCfgArray.Instance.dataArray;
+            List<int> arr = new List<int> { 0, 1, 2, 3, 4, 5, 6, 7 };
+            for (int i = 0; i < roleSkillCfgs.Length; i++)
+            {
+                int partIndex = Random.Range(0, arr.Count);
+                npcSkillDic.Add(arr[partIndex], roleSkillCfgs[i]);
+                arr.RemoveAt(partIndex);
+            }
+            return npcSkillDic;
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Data/VO/SkillData.cs

@@ -7,4 +7,12 @@ namespace GFGGame
         public int id;
         public int lv;
     }
+    public class BuffData
+    {
+        public bool isShield = false;//是否护盾中
+        public int addCount = 0;//天工使用次数
+        public int minusCount = 0;//荆钗使用次数
+        public int breakCount = 0;//断织使用次数
+        public int shieldCount = 0;//锦衣使用次数
+    }
 }

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

@@ -2,6 +2,7 @@ using System.Collections.Generic;
 using UnityEngine;
 using System;
 using System.Linq;
+using FairyGUI;
 
 namespace GFGGame
 {
@@ -76,6 +77,20 @@ namespace GFGGame
             }
         }
 
+        //战斗对象最终得分
+        private int _targetTotalScore;
+        public int npcTotalScore
+        {
+            get
+            {
+                return _targetTotalScore;
+            }
+            set
+            {
+                _targetTotalScore = value;
+            }
+        }
+
         public void Dispose()
         {
             _sceneObj = null;
@@ -522,5 +537,19 @@ namespace GFGGame
             }
             return true;
         }
+
+        //根据位置原点和随机范围获取评分位置
+        public void GetCirclePos(Vector2 pos, int range, out float x, out float y)
+        {
+            int numX = UnityEngine.Random.Range(0, 2);
+            int signX = numX % 2 == 0 ? 1 : -1;
+            float rangeX = UnityEngine.Random.Range(0, range);
+            x = pos.x + signX * (rangeX);
+
+            int numY = UnityEngine.Random.Range(0, 2);
+            int signY = numY % 2 == 0 ? 1 : -1;
+            float rangeY = UnityEngine.Random.Range(0, range);
+            y = pos.y + signY * (rangeY);
+        }
     }
 }

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

@@ -15,7 +15,7 @@ namespace GFGGame
         private const string FORMAT_EFFECT_OBJ_NAME = "T{0}_eff";
         private const string FORMAT_LAYER_RES_NAME_WITH_T = "{0}_t";
 
-        public static void AddItem(int itemID, GameObject sceneObj, bool needSetMask = false)
+        public static void AddItem(int itemID, GameObject sceneObj, bool needSetMask = false, bool showAni = true)
         {
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemID);
             if (itemCfg != null)
@@ -34,13 +34,13 @@ namespace GFGGame
                 //普通层
                 if (itemCfg.resLayer1 > 0)
                 {
-                    updateLayerRes(itemCfg, parentObj, 1, itemCfg.resLayer1 == 2, needSetMask);
+                    updateLayerRes(itemCfg, parentObj, 1, itemCfg.resLayer1 == 2, needSetMask, showAni);
                 }
                 //特殊层
                 if (itemCfg.resLayer2 > 0)
                 {
 
-                    updateLayerRes(itemCfg, parentObj, 2, itemCfg.resLayer2 == 2, needSetMask);
+                    updateLayerRes(itemCfg, parentObj, 2, itemCfg.resLayer2 == 2, needSetMask, showAni);
                 }
                 //特效
                 if (itemCfg.effLayer > 0)
@@ -159,7 +159,7 @@ namespace GFGGame
             assetDisposer.resPath = resPath;
         }
 
-        private static void updateLayerRes(ItemCfg itemCfg, GameObject parentObj, int layerId, bool isT, bool needSetMask)
+        private static void updateLayerRes(ItemCfg itemCfg, GameObject parentObj, int layerId, bool isT, bool needSetMask, bool showAni = true)
         {
 
             ItemTypeCfg typeCfg = ItemTypeCfgArray.Instance.GetCfg(itemCfg.subType);
@@ -180,7 +180,7 @@ namespace GFGGame
                 GameObject.DestroyImmediate(tf.gameObject);
                 tf = null;
             }
-            if (itemCfg.isAni > 0)
+            if (itemCfg.isAni > 0 && showAni)
             {
                 AddAnimationObj(res, objName, parentObj, sortingOrder);
             }

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

@@ -31,7 +31,7 @@ namespace GFGGame
             CustomSuitData suitSavedData = CustomSuitDataManager.GetCurrentSuitList();
             int[] equipDatas = suitSavedData.equipDatas;
             UpdateRole(equipDatas, sceneObj, false);
-            if(suitSavedData.pic > 0 && suitSavedData.suitId > 0)
+            if (suitSavedData.pic > 0 && suitSavedData.suitId > 0)
             {
                 SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(suitSavedData.suitId);
                 DressUpUtil.UpdateBody(suitCfg.picRes, sceneObj, !string.IsNullOrEmpty(suitCfg.aniRes), suitCfg.effRes);
@@ -42,31 +42,31 @@ namespace GFGGame
             }
         }
 
-        public static void UpdateRole(int[] equipDatas, GameObject sceneObj, bool needSetMask = false, int[] exceptTypes = null)
+        public static void UpdateRole(int[] equipDatas, GameObject sceneObj, bool needSetMask = false, int[] exceptTypes = null, bool showAni = true)
         {
             Reset(sceneObj);
             int count = equipDatas.Length;
-            for(int i = 0; i < count; i++)
+            for (int i = 0; i < count; i++)
             {
                 int id = (int)equipDatas[i];
-                if(exceptTypes != null)
+                if (exceptTypes != null)
                 {
                     int subType = ItemUtil.GetItemSubType(id);
-                    if(Array.IndexOf(exceptTypes, subType) >= 0)
+                    if (Array.IndexOf(exceptTypes, subType) >= 0)
                     {
                         continue;
                     }
                 }
-                DressUpUtil.AddItem(id, sceneObj, needSetMask);
+                DressUpUtil.AddItem(id, sceneObj, needSetMask, showAni);
             }
             DressUpUtil.UpdateBody(null, sceneObj, false, null, needSetMask);
         }
-        
+
         public static void UpdateDialogBg(string value, GameObject sceneObj)
         {
             Transform tf = sceneObj.transform.Find("Bg");
             SpriteRenderer spr = tf.GetComponent<SpriteRenderer>();
-            if(value == "0")
+            if (value == "0")
             {
                 spr.sprite = null;
             }
@@ -83,7 +83,7 @@ namespace GFGGame
         {
             Transform tf = sceneObj.transform.Find("Pic");
             SpriteRenderer spr = tf.GetComponent<SpriteRenderer>();
-            if(value == "0")
+            if (value == "0")
             {
                 spr.sprite = null;
             }
@@ -127,7 +127,7 @@ namespace GFGGame
         {
             //背景层次
             Transform bg = sceneObj.transform.Find("Bg");
-            if(bg != null)
+            if (bg != null)
             {
                 SpriteRenderer spr = bg.GetComponent<SpriteRenderer>();
                 if (spr != null)
@@ -138,7 +138,7 @@ namespace GFGGame
             }
             //角色清理
             Transform role = sceneObj.transform.Find("Role");
-            if(role != null)
+            if (role != null)
             {
                 int childCount = role.childCount;
                 for (int i = childCount - 1; i >= 0; --i)

GameClient/Assets/Game/HotUpdate/ExcelConfig.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 1d5e1b9bebe16df4bb0dba92a5d2bb72
+guid: bd06685c0f9c17e42933bc22b14c60a9
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

GameClient/Assets/Game/HotUpdate/ExcelConfig/Manager.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 0f31b5f9df14c4f4dbffb48c712daeb9
+guid: f27df8c9cb067c948a656202f550affb
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

GameClient/Assets/Game/HotUpdate/ExcelConfig/Manager/CardCfgManager.cs

@@ -1,4 +1,6 @@
-using System.Collections.Generic;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
 
 namespace GFGGame
 {

GameClient/Assets/Game/HotUpdate/ExcelConfig/Manager/CardCfgManager.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 5a6329cdeb10d1f4b9be34a25e6edc13
+guid: 6a2d1e4d164646a48a79fd2514d090d0
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/ExcelConfig/Manager/ClothingShopCfgManager.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 19216ab11d7afd643a69ccdcc93c5b36
+guid: ac69a4094aeb2d74996978a3a1e61ccc
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/ExcelConfig/Manager/StoryCfgManager.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a5e66506c93223145b276ba8945157c7
+guid: 28584a2446031ea46925b2ec41364f8a
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_PhotographUI.cs

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.DressUp
+{
+    public partial class UI_PhotographUI
+    {
+        public GComponent target;
+        public GButton m_btnBack;
+        public GLoader m_loaBg;
+        public const string URL = "ui://mbo439wbbe944a";
+        public const string PACKAGE_NAME = "DressUp";
+        public const string RES_NAME = "PhotographUI";
+        private static UI_PhotographUI _proxy;
+
+        public static UI_PhotographUI Create(GObject gObject = null)
+        {
+            var ui = new UI_PhotographUI();
+            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_PhotographUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_PhotographUI();
+            }
+            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_btnBack = (GButton)comp.GetChild("btnBack");
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_btnBack = null;
+            m_loaBg = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_PhotographUI.cs.meta

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

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

@@ -0,0 +1,83 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Main
+{
+    public partial class UI_ComBtnSkill
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GLoader m_icon;
+        public GLoader m_icon1;
+        public GProgressBar m_proCD;
+        public Transition m_t0;
+        public const string URL = "ui://mfvz4q8kv3k9c0";
+        public const string PACKAGE_NAME = "Main";
+        public const string RES_NAME = "ComBtnSkill";
+        private static UI_ComBtnSkill _proxy;
+
+        public static UI_ComBtnSkill Create(GObject gObject = null)
+        {
+            var ui = new UI_ComBtnSkill();
+            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_ComBtnSkill Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComBtnSkill();
+            }
+            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_icon = (GLoader)comp.GetChild("icon");
+            m_icon1 = (GLoader)comp.GetChild("icon1");
+            m_proCD = (GProgressBar)comp.GetChild("proCD");
+            m_t0 = comp.GetTransition("t0");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_icon = null;
+            m_icon1 = null;
+            m_proCD = null;
+            m_t0 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

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

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

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

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

@@ -0,0 +1,78 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Main
+{
+    public partial class UI_ComRoleSkillScore
+    {
+        public GComponent target;
+        public UI_ComRoleSkill m_comRoleSkill;
+        public Transition m_t0;
+        public Transition m_t1;
+        public const string URL = "ui://mfvz4q8kv3k9c1";
+        public const string PACKAGE_NAME = "Main";
+        public const string RES_NAME = "ComRoleSkillScore";
+        private static UI_ComRoleSkillScore _proxy;
+
+        public static UI_ComRoleSkillScore Create(GObject gObject = null)
+        {
+            var ui = new UI_ComRoleSkillScore();
+            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_ComRoleSkillScore Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComRoleSkillScore();
+            }
+            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_comRoleSkill = (UI_ComRoleSkill)UI_ComRoleSkill.Create(comp.GetChild("comRoleSkill"));
+            m_t0 = comp.GetTransition("t0");
+            m_t1 = comp.GetTransition("t1");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_comRoleSkill.Dispose();
+            m_comRoleSkill = null;
+            m_t0 = null;
+            m_t1 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

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

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

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

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

@@ -8,7 +8,6 @@ namespace UI.Main
     {
         public GProgressBar target;
         public GTextField m_txtCount;
-        public GImage m_imgCurScore;
         public GImage m_imgFirstScore;
         public const string URL = "ui://mfvz4q8kvuz5bh";
         public const string PACKAGE_NAME = "Main";
@@ -58,13 +57,11 @@ namespace UI.Main
         private void Init(GComponent comp)
         {
             m_txtCount = (GTextField)comp.GetChild("txtCount");
-            m_imgCurScore = (GImage)comp.GetChild("imgCurScore");
             m_imgFirstScore = (GImage)comp.GetChild("imgFirstScore");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_txtCount = null;
-            m_imgCurScore = null;
             m_imgFirstScore = null;
             if(disposeTarget && target != null)
             {

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

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

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

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

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

@@ -18,6 +18,7 @@ namespace UI.Main
         public GButton m_btnExit;
         public GButton m_btnHelp;
         public GTextField m_txtVersion;
+        public GLoader m_loaChangeName;
         public const string URL = "ui://mfvz4q8kd4iw6k";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "RoleInfoUI";
@@ -76,6 +77,7 @@ namespace UI.Main
             m_btnExit = (GButton)comp.GetChild("btnExit");
             m_btnHelp = (GButton)comp.GetChild("btnHelp");
             m_txtVersion = (GTextField)comp.GetChild("txtVersion");
+            m_loaChangeName = (GLoader)comp.GetChild("loaChangeName");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -90,6 +92,7 @@ namespace UI.Main
             m_btnExit = null;
             m_btnHelp = null;
             m_txtVersion = null;
+            m_loaChangeName = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -18,7 +18,7 @@ namespace UI.Main
         public GGraph m_grh_5;
         public GGraph m_grh_6;
         public GGraph m_grh_7;
-        public UI_ProgressBar1 m_proCount;
+        public UI_ProgressBar1 m_proScore;
         public const string URL = "ui://mfvz4q8k8xpg3x";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "StoryFightSingleScoreUI";
@@ -77,7 +77,7 @@ 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_proCount = (UI_ProgressBar1)UI_ProgressBar1.Create(comp.GetChild("proCount"));
+            m_proScore = (UI_ProgressBar1)UI_ProgressBar1.Create(comp.GetChild("proScore"));
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -95,8 +95,8 @@ namespace UI.Main
             m_grh_5 = null;
             m_grh_6 = null;
             m_grh_7 = null;
-            m_proCount.Dispose();
-            m_proCount = null;
+            m_proScore.Dispose();
+            m_proScore = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -7,11 +7,27 @@ namespace UI.Main
     public partial class UI_StoryFightTargetScoreUI
     {
         public GComponent target;
+        public GButton m_btnSkip;
         public UI_CompFightScore m_selfScore;
+        public UI_CompFightScore m_targetScore;
+        public GButton m_btnBack;
+        public UI_ProgressBarTargetScore m_proScore;
+        public UI_comMineCircle m_comMineCircle;
+        public UI_comTargetCircle m_comTargetCircle;
+        public UI_ComSkillShield m_ComShieldMine;
+        public UI_ComSkillShield m_ComShieldNpc;
+        public GProgressBar m_proMinusMine;
+        public GProgressBar m_proMinusNpc;
+        public UI_ComRoleSkillScore m_ComRoleSkillMineAdd;
+        public UI_ComRoleSkillScore m_ComRoleSkillMineMinus;
+        public UI_ComRoleSkillScore m_ComRoleSkillNpcAdd;
+        public UI_ComRoleSkillScore m_ComRoleSkillNpcMinus;
         public UI_CompFightResultName m_selfName;
         public UI_CompFightResultName m_targetName;
-        public GButton m_btnSkip;
-        public UI_CompFightScore m_targetScore;
+        public UI_ComBtnSkill m_btnSkill0;
+        public UI_ComBtnSkill m_btnSkill1;
+        public UI_ComBtnSkill m_btnSkill2;
+        public UI_ComBtnSkill m_btnSkill3;
         public const string URL = "ui://mfvz4q8k8xpg3w";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "StoryFightTargetScoreUI";
@@ -59,23 +75,68 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
+            m_btnSkip = (GButton)comp.GetChild("btnSkip");
             m_selfScore = (UI_CompFightScore)UI_CompFightScore.Create(comp.GetChild("selfScore"));
+            m_targetScore = (UI_CompFightScore)UI_CompFightScore.Create(comp.GetChild("targetScore"));
+            m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_proScore = (UI_ProgressBarTargetScore)UI_ProgressBarTargetScore.Create(comp.GetChild("proScore"));
+            m_comMineCircle = (UI_comMineCircle)UI_comMineCircle.Create(comp.GetChild("comMineCircle"));
+            m_comTargetCircle = (UI_comTargetCircle)UI_comTargetCircle.Create(comp.GetChild("comTargetCircle"));
+            m_ComShieldMine = (UI_ComSkillShield)UI_ComSkillShield.Create(comp.GetChild("ComShieldMine"));
+            m_ComShieldNpc = (UI_ComSkillShield)UI_ComSkillShield.Create(comp.GetChild("ComShieldNpc"));
+            m_proMinusMine = (GProgressBar)comp.GetChild("proMinusMine");
+            m_proMinusNpc = (GProgressBar)comp.GetChild("proMinusNpc");
+            m_ComRoleSkillMineAdd = (UI_ComRoleSkillScore)UI_ComRoleSkillScore.Create(comp.GetChild("ComRoleSkillMineAdd"));
+            m_ComRoleSkillMineMinus = (UI_ComRoleSkillScore)UI_ComRoleSkillScore.Create(comp.GetChild("ComRoleSkillMineMinus"));
+            m_ComRoleSkillNpcAdd = (UI_ComRoleSkillScore)UI_ComRoleSkillScore.Create(comp.GetChild("ComRoleSkillNpcAdd"));
+            m_ComRoleSkillNpcMinus = (UI_ComRoleSkillScore)UI_ComRoleSkillScore.Create(comp.GetChild("ComRoleSkillNpcMinus"));
             m_selfName = (UI_CompFightResultName)UI_CompFightResultName.Create(comp.GetChild("selfName"));
             m_targetName = (UI_CompFightResultName)UI_CompFightResultName.Create(comp.GetChild("targetName"));
-            m_btnSkip = (GButton)comp.GetChild("btnSkip");
-            m_targetScore = (UI_CompFightScore)UI_CompFightScore.Create(comp.GetChild("targetScore"));
+            m_btnSkill0 = (UI_ComBtnSkill)UI_ComBtnSkill.Create(comp.GetChild("btnSkill0"));
+            m_btnSkill1 = (UI_ComBtnSkill)UI_ComBtnSkill.Create(comp.GetChild("btnSkill1"));
+            m_btnSkill2 = (UI_ComBtnSkill)UI_ComBtnSkill.Create(comp.GetChild("btnSkill2"));
+            m_btnSkill3 = (UI_ComBtnSkill)UI_ComBtnSkill.Create(comp.GetChild("btnSkill3"));
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_btnSkip = null;
             m_selfScore.Dispose();
             m_selfScore = null;
+            m_targetScore.Dispose();
+            m_targetScore = null;
+            m_btnBack = null;
+            m_proScore.Dispose();
+            m_proScore = null;
+            m_comMineCircle.Dispose();
+            m_comMineCircle = null;
+            m_comTargetCircle.Dispose();
+            m_comTargetCircle = null;
+            m_ComShieldMine.Dispose();
+            m_ComShieldMine = null;
+            m_ComShieldNpc.Dispose();
+            m_ComShieldNpc = null;
+            m_proMinusMine = null;
+            m_proMinusNpc = null;
+            m_ComRoleSkillMineAdd.Dispose();
+            m_ComRoleSkillMineAdd = null;
+            m_ComRoleSkillMineMinus.Dispose();
+            m_ComRoleSkillMineMinus = null;
+            m_ComRoleSkillNpcAdd.Dispose();
+            m_ComRoleSkillNpcAdd = null;
+            m_ComRoleSkillNpcMinus.Dispose();
+            m_ComRoleSkillNpcMinus = null;
             m_selfName.Dispose();
             m_selfName = null;
             m_targetName.Dispose();
             m_targetName = null;
-            m_btnSkip = null;
-            m_targetScore.Dispose();
-            m_targetScore = null;
+            m_btnSkill0.Dispose();
+            m_btnSkill0 = null;
+            m_btnSkill1.Dispose();
+            m_btnSkill1 = null;
+            m_btnSkill2.Dispose();
+            m_btnSkill2 = null;
+            m_btnSkill3.Dispose();
+            m_btnSkill3 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -0,0 +1,80 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Main
+{
+    public partial class UI_comMineCircle
+    {
+        public GComponent target;
+        public GLoader m_loaIcon;
+        public GTextField m_txtPart;
+        public GTextField m_txtCount;
+        public Transition m_t0;
+        public const string URL = "ui://mfvz4q8kv3k9cv";
+        public const string PACKAGE_NAME = "Main";
+        public const string RES_NAME = "comMineCircle";
+        private static UI_comMineCircle _proxy;
+
+        public static UI_comMineCircle Create(GObject gObject = null)
+        {
+            var ui = new UI_comMineCircle();
+            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_comMineCircle Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_comMineCircle();
+            }
+            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_loaIcon = (GLoader)comp.GetChild("loaIcon");
+            m_txtPart = (GTextField)comp.GetChild("txtPart");
+            m_txtCount = (GTextField)comp.GetChild("txtCount");
+            m_t0 = comp.GetTransition("t0");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaIcon = null;
+            m_txtPart = null;
+            m_txtCount = null;
+            m_t0 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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