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

# Conflicts:
#	GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes

FGUIProject/assets/ClothingFoster/SuitUI.xml

@@ -14,7 +14,7 @@
     <text id="n3_pjip" name="txtName" xy="346,94" size="387,52" fontSize="38" color="#9d824e" align="center" autoSize="none" text="分类名称">
       <relation target="n4_pjip" sidePair="center-center,middle-middle"/>
     </text>
-    <loader id="n18_py5g" name="loaRarity" xy="940,124" size="57,224" url="ui://eg2y0ldpqdrt15" autoSize="true"/>
+    <loader id="n18_py5g" name="loaRarity" xy="940,124" size="54,224" url="ui://eg2y0ldpqdrt15" autoSize="true"/>
     <image id="n37_l4ui" name="n37" src="l4ui26" fileName="images/fzyc_yhditu_2.png" xy="0,1336">
       <relation target="" sidePair="bottom-bottom"/>
     </image>
@@ -54,7 +54,7 @@
       <relation target="" sidePair="bottom-bottom"/>
     </group>
     <text id="n22_nk8d" name="txtRenewProperty" xy="357,1375" size="365,46" group="n29_nk8d" fontSize="34" color="#aa9063" text="套装所有部件属性+10%"/>
-    <component id="n26_nk8d" name="comRenewCost" src="ojlz61" fileName="components/ComConsumeCurrency.xml" pkg="eg2y0ldp" xy="400,1706" group="n29_nk8d"/>
+    <component id="n26_nk8d" name="comRenewCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="400,1706" group="n29_nk8d"/>
     <component id="n27_nk8d" name="btnRenew" src="bd1c1r" fileName="components/Button8.xml" xy="368,1755" group="n29_nk8d"/>
     <text id="n28_nk8d" name="txtRenewTips" xy="442,1840" size="196,44" group="n29_nk8d" fontSize="32" color="#bbafa3" text="完成养护阶段"/>
     <component id="n23_nk8d" name="comRenewReward" src="nk8d14" fileName="components/ComRenewReward.xml" xy="68,1400" size="300,300" group="n39_l4ui"/>

FGUIProject/assets/Common/ModalStatusUI.xml

@@ -4,11 +4,10 @@
     <graph id="n3_ityj" name="n3" xy="0,0" size="1080,1920" alpha="0" type="rect" lineSize="0" fillColor="#ff000000">
       <relation target="" sidePair="width-width,height-height"/>
     </graph>
-    <graph id="n1_d4iw" name="n1" xy="390,20" size="300,40" alpha="0.5" type="rect" lineSize="0" fillColor="#ff000000">
+    <graph id="n1_d4iw" name="n1" xy="390,20" size="300,40" visible="false" alpha="0.5" type="rect" lineSize="0" fillColor="#ff000000">
       <relation target="" sidePair="center-center,middle-middle"/>
     </graph>
-    <text id="n2_d4iw" name="txtMessage" xy="290,19" size="500,42" fontSize="30" color="#ffffff" align="center" autoSize="none" autoClearText="true" text="这是一个提示">
-      <relation target="n1_d4iw" sidePair="center-center,middle-middle%"/>
-    </text>
+    <text id="n2_d4iw" name="txtMessage" xy="290,976" size="500,42" fontSize="30" color="#ad987d" align="center" autoSize="none" autoClearText="true" text="这是一个提示"/>
+    <graph id="n4_t6aj" name="holder" xy="539,959" size="1,1"/>
   </displayList>
 </component>

FGUIProject/assets/CommonGame/ApproachOfItemUI.xml

@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="678,448">
+<component size="678,508">
   <displayList>
-    <loader id="n0_lwri" name="n0" xy="0,0" size="678,448" url="ui://mk0fwx0xlwri5u" fill="scaleFree">
-      <relation target="n4_lwri" sidePair="bottomext-bottom"/>
-    </loader>
+    <loader id="n0_lwri" name="n0" xy="0,0" size="678,508" url="ui://mk0fwx0xlwri5u" fill="scaleFree"/>
     <image id="n1_lwri" name="n1" src="lwri5x" fileName="images/hc_btkuang_1.png" xy="81,38"/>
     <text id="n2_lwri" name="n2" xy="265,41" size="148,49" fontSize="36" color="#f9e4c2" text="获取途径"/>
-    <text id="n3_lwri" name="txtName" xy="253,124" size="167,42" fontSize="30" color="#9c8872" vars="true" text="* {v1=物品名称 }*">
+    <text id="n3_lwri" name="txtName" xy="253,124" size="167,41" fontSize="30" color="#9c8872" vars="true" text="* {v1=物品名称 }*">
       <relation target="" sidePair="center-center"/>
     </text>
-    <list id="n4_lwri" name="listApproach" xy="196,215" size="285,162" overflow="scroll" lineGap="30" defaultItem="ui://eg2y0ldplwri5y" autoClearItems="true">
+    <list id="n4_lwri" name="listApproach" xy="196,200" size="285,237" overflow="scroll" lineGap="25" defaultItem="ui://eg2y0ldplwri5y" align="center" autoClearItems="true">
       <item/>
       <item/>
       <item/>
     </list>
     <text id="n5_lwri" name="txtNone" xy="81,265" size="516,44" fontSize="32" color="#d2ba94" vars="true" text="当前无获取方式，敬请期待后续活动"/>
   </displayList>
-  <relation target="n4_lwri" sidePair="bottomext-bottom"/>
 </component>

FGUIProject/assets/CommonGame/RewardUI.xml

@@ -6,15 +6,12 @@
     <image id="n1_m9wm" name="imgTitle" src="m9wm8r" fileName="images/gxhd_btbt.png" xy="0,300" group="n8_m9wm">
       <relation target="" sidePair="center-center"/>
     </image>
-    <list id="n6_m9wm" name="listReward" xy="95,730" size="889,580" group="n8_m9wm" layout="flow_hz" overflow="scroll" lineGap="60" colGap="91" defaultItem="ui://eg2y0ldpm9wm8u" align="center">
+    <list id="n6_m9wm" name="listReward" xy="144,730" size="791,580" group="n8_m9wm" layout="flow_hz" overflow="scroll" lineGap="60" colGap="91" defaultItem="ui://eg2y0ldpm9wm8u" autoItemSize="true" align="center">
       <relation target="" sidePair="center-center"/>
       <item/>
       <item/>
       <item/>
       <item/>
-      <item/>
-      <item/>
-      <item/>
     </list>
     <group id="n8_m9wm" name="grp" xy="0,300" size="1080,1010" advanced="true"/>
     <text id="n7_m9wm" name="n7" xy="430,1822" size="220,49" fontSize="36" color="#958163" text="点击屏幕继续">

FGUIProject/assets/CommonGame/package.xml

@@ -70,7 +70,7 @@
     <image id="lwri5x" name="hc_btkuang_1.png" path="/images/" exported="true"/>
     <component id="lwri5y" name="ButtonApproach.xml" path="/components/" exported="true"/>
     <image id="j53916" name="zjm_gnk.png" path="/images/"/>
-    <font id="kst18" name="STZHONGS.TTF" path="/" renderMode="" samplePointSize="16"/>
+    <font id="kst18" name="STZHONGS.TTF" path="/" exported="true" renderMode="" samplePointSize="16"/>
     <component id="r9gf5z" name="ButtonInValueBar.xml" path="/components/"/>
     <component id="qp4l60" name="ButtonHome.xml" path="/components/" exported="true"/>
     <image id="pq5x62" name="kp_sxing_x_1.png" path="/imagesExport/" exported="true"/>
@@ -175,6 +175,7 @@
     <image id="qdrt18" name="hd_sxicon_4.png" path="/imagesExport/" exported="true"/>
     <image id="bd1ca0" name="jingzhongh_bg.jpg" path="/bgimg/" exported="true" atlas="alone_npot"/>
     <component id="n3xha1" name="ComCostCurrency.xml" path="/components/" exported="true"/>
+    <font id="k1kha2" name="SIMKAI.TTF" path="/" exported="true" renderMode="" samplePointSize="16"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/DressUp/PhotographUI.xml

@@ -7,8 +7,8 @@
     <loader id="n11_o139" name="loaGuide" xy="148,153" size="783,972">
       <relation target="" sidePair="bottom-bottom"/>
     </loader>
-    <loader id="n12_o139" name="loaGuide1" xy="148,185" size="783,1397">
-      <relation target="" sidePair="bottom-bottom"/>
+    <loader id="n12_o139" name="loaGuide1" xy="148,154" size="783,1580">
+      <relation target="" sidePair="width-width,height-height,bottom-bottom"/>
     </loader>
     <component id="n9_g3xa" name="comSelectBox" src="g3xa4l" fileName="ComChecked.xml" xy="420,728" pivot="0.5,0.5" anchor="true"/>
     <component id="n1_yd72" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>

FGUIProject/assets/Launcher/LauncherAlertUI.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="936,472">
   <displayList>
-    <image id="n0_l55o" name="bg" src="k0v5h" fileName="images/di_1.png" xy="0,0" size="936,472">
+    <image id="n0_l55o" name="bg" src="wgy9k" fileName="images/hc_kuang_6.png" xy="0,0" size="936,472">
       <relation target="n5_l55o" sidePair="height-height"/>
     </image>
-    <text id="n5_l55o" name="txtContent" xy="111,124" size="714,144" fontSize="36" color="#876e54" align="center" vAlign="middle" autoSize="height" autoClearText="true" text="示例示例示例示例示例示例示例示例示例示例示例示例示例示例示例示例示例示例示例示例示例示例示例示例示例示例"/>
-    <component id="n3_l55o" name="btnLeft" src="k0v5i" fileName="components/Button1.xml" xy="83,322">
+    <text id="n5_l55o" name="txtContent" xy="111,124" size="714,142" fontSize="36" color="#876e54" align="center" vAlign="middle" autoSize="height" autoClearText="true" text="示例示例示例示例示例示例示例示例示例示例示例示例示例示例示例示例示例示例示例示例示例示例示例示例示例示例"/>
+    <component id="n3_l55o" name="btnLeft" src="k0v5i" fileName="components/Button1.xml" xy="54,322">
       <relation target="n0_l55o" sidePair="bottom-bottom"/>
       <Button title="取消"/>
     </component>
-    <component id="n4_l55o" name="btnRight" src="k0v5j" fileName="components/Button2.xml" xy="525,322">
+    <component id="n4_l55o" name="btnRight" src="k0v5j" fileName="components/Button2.xml" xy="496,322">
       <relation target="n3_l55o" sidePair="top-top"/>
       <Button title="确认"/>
     </component>

FGUIProject/assets/Launcher/components/Button1.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="331,111" extention="Button">
+<component size="380,111" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
     <image id="n0_q08x" name="n0" src="k0v5f" fileName="images/ANNIU_1.png" xy="0,0">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <text id="n1_q08x" name="title" xy="0,0" size="331,111" fontSize="42" color="#ffffff" align="center" vAlign="middle" autoSize="none" singleLine="true" text="">
+    <text id="n1_q08x" name="title" xy="0,-5" size="380,111" fontSize="42" color="#ffffff" align="center" vAlign="middle" autoSize="none" singleLine="true" text="666">
       <relation target="" sidePair="width-width,height-height"/>
     </text>
   </displayList>

FGUIProject/assets/Launcher/components/Button2.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="331,111" extention="Button">
+<component size="380,111" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
     <image id="n0_q08x" name="n0" src="k0v5g" fileName="images/ANNIU_2.png" xy="0,0">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <text id="n1_q08x" name="title" xy="0,0" size="331,111" fontSize="42" color="#ffffff" align="center" vAlign="middle" autoSize="none" singleLine="true" text="">
+    <text id="n1_q08x" name="title" xy="0,-5" size="380,111" fontSize="42" color="#ffffff" align="center" vAlign="middle" autoSize="none" singleLine="true" text="666">
       <relation target="" sidePair="width-width,height-height"/>
     </text>
   </displayList>

FGUIProject/assets/Launcher/package.xml

@@ -16,6 +16,7 @@
     <image id="k0v5h" name="di_1.png" path="/images/" scale="9grid" scale9grid="22,22,44,44" gridTile="16"/>
     <component id="k0v5i" name="Button1.xml" path="/components/"/>
     <component id="k0v5j" name="Button2.xml" path="/components/"/>
+    <image id="wgy9k" name="hc_kuang_6.png" path="/images/" scale="9grid" scale9grid="49,57,16,10"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\Resources\UI\Launcher" packageCount="2" genCode="true" codePath="..\GameClient\Assets\Game\Launcher\FairyGUI\GenCode\" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Main/Font5/Font9.fnt

@@ -0,0 +1,13 @@
+info size=56 colored=false
+char id=48 img=k1khdq xoffset=0 yoffset=0 xadvance=0
+char id=49 img=k1khdr xoffset=0 yoffset=0 xadvance=0
+char id=50 img=k1khds xoffset=0 yoffset=0 xadvance=0
+char id=51 img=k1khdt xoffset=0 yoffset=0 xadvance=0
+char id=52 img=k1khdu xoffset=0 yoffset=0 xadvance=0
+char id=53 img=k1khdv xoffset=0 yoffset=0 xadvance=0
+char id=54 img=k1khdw xoffset=0 yoffset=0 xadvance=0
+char id=55 img=k1khdx xoffset=0 yoffset=0 xadvance=0
+char id=56 img=k1khdy xoffset=0 yoffset=0 xadvance=0
+char id=57 img=k1khdz xoffset=0 yoffset=0 xadvance=0
+char id=43 img=k1khe9 xoffset=0 yoffset=0 xadvance=0
+char id=45 img=k1khea xoffset=0 yoffset=0 xadvance=0

FGUIProject/assets/Main/MainUI.xml

@@ -33,7 +33,7 @@
       <relation target="" sidePair="bottom-bottom"/>
       <Button icon="ui://mfvz4q8kkqhddo"/>
     </component>
-    <component id="n45_kqhd" name="btnSurvey" src="q08xu" fileName="components/ButtonModle1.xml" xy="561,1455">
+    <component id="n45_kqhd" name="btnSurvey" src="q08xu" fileName="components/ButtonModle1.xml" xy="561,1455" visible="false">
       <relation target="" sidePair="bottom-bottom"/>
       <Button icon="ui://mfvz4q8kkqhddn"/>
     </component>

FGUIProject/assets/Main/StoryFightQuicklyUI.xml

@@ -1,19 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="936,1130">
   <displayList>
-    <image id="n0_s2cc" name="n0" src="lwri5u" fileName="imagesExport/hc_kuang_6.png" pkg="mk0fwx0x" xy="0,0" size="936,1130"/>
-    <image id="n18_srnc" name="n18" src="ehs93" fileName="images/yx_btzs.png" pkg="eg2y0ldp" xy="33,-93"/>
-    <image id="n3_s2cc" name="n3" src="srnc98" fileName="images/zd_btzi_1.png" xy="15,-120"/>
-    <list id="n13_s2cc" name="list" xy="20,63" size="895,850" overflow="scroll" lineGap="10" align="center"/>
-    <text id="n15_s2cc" name="txtPowerDesc" xy="613,1080" size="170,42" fontSize="30" color="#c1aa8f" align="center" vars="true" autoSize="none" text="消耗体力{v1=60}"/>
+    <image id="n0_s2cc" name="n0" src="lwri5u" fileName="imagesExport/hc_kuang_6.png" pkg="mk0fwx0x" xy="0,0" size="936,1130" group="n19_mueb"/>
+    <image id="n18_srnc" name="n18" src="ehs93" fileName="images/yx_btzs.png" pkg="eg2y0ldp" xy="33,-93" group="n19_mueb"/>
+    <image id="n3_s2cc" name="n3" src="srnc98" fileName="images/zd_btzi_1.png" xy="15,-120" group="n19_mueb"/>
+    <list id="n13_s2cc" name="list" xy="20,63" size="895,850" group="n19_mueb" overflow="scroll" lineGap="10" align="center"/>
+    <text id="n15_s2cc" name="txtPowerDesc" xy="613,1080" size="170,42" group="n19_mueb" fontSize="30" color="#c1aa8f" align="center" vars="true" autoSize="none" text="消耗体力{v1=60}"/>
     <component id="n6_s2cc" name="btnExit" src="q08x6" fileName="components/Button1.xml" pkg="mk0fwx0x" xy="57,958" group="n16_nzmy">
       <Button title="结束挑战"/>
     </component>
     <component id="n5_s2cc" name="btnFightTimes" src="q08x7" fileName="components/Button2.xml" pkg="mk0fwx0x" xy="499,960" group="n16_nzmy">
       <Button title="挑战十次"/>
     </component>
-    <group id="n16_nzmy" name="n16" xy="57,958" size="822,113" advanced="true" layout="hz" colGap="62" excludeInvisibles="true">
+    <group id="n16_nzmy" name="n16" xy="57,958" size="822,113" group="n19_mueb" advanced="true" layout="hz" colGap="62" excludeInvisibles="true">
       <relation target="" sidePair="center-center"/>
     </group>
+    <group id="n19_mueb" name="n19" xy="0,-120" size="936,1250" advanced="true"/>
+    <text id="n25_mueb" name="n25" xy="324,380" size="287,76" group="n24_mueb" fontSize="58" color="#fdf4d1" text="速刷中......"/>
+    <image id="n21_mueb" name="n21" src="muebec" fileName="images/sjsd_ss_1.png" xy="99,489" group="n24_mueb">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <component id="n22_mueb" name="bar" src="muebef" fileName="components/Component4.xml" xy="99,491" size="705,28" group="n24_mueb"/>
+    <image id="n23_mueb" name="n23" src="muebeb" fileName="images/sjsd_ss_3.png" xy="729,491" group="n24_mueb">
+      <relation target="n22_mueb" sidePair="right-right"/>
+    </image>
+    <group id="n24_mueb" name="n24" xy="99,380" size="737,141" advanced="true"/>
   </displayList>
+  <transition name="t0" autoPlay="true">
+    <item time="0" type="Size" target="n22_mueb" tween="true" startValue="0,28" endValue="705,28" duration="48" ease="Linear"/>
+    <item time="0" type="Visible" target="n19_mueb" value="false"/>
+    <item time="0" type="Visible" target="n24_mueb" value="true"/>
+    <item time="48" type="Visible" target="n19_mueb" value="true"/>
+    <item time="48" type="Visible" target="n24_mueb" value="false"/>
+  </transition>
 </component>

FGUIProject/assets/Main/StoryFightResultUI.xml

@@ -1,22 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
   <displayList>
-    <component id="n0_8xpg" name="selfScore" src="8xpg4z" fileName="components/CompFightScoreResult.xml" xy="8,17">
-      <relation target="" sidePair="center-center,middle-middle"/>
+    <component id="n0_8xpg" name="selfScore" src="8xpg4z" fileName="components/CompFightScoreResult.xml" xy="8,-415"/>
+    <component id="n2_8xpg" name="expBar" src="8xpg52" fileName="components/CompFightExpBar.xml" xy="33,1924">
+      <relation target="" sidePair="center-center,bottom-bottom"/>
     </component>
-    <component id="n2_8xpg" name="expBar" src="8xpg52" fileName="components/CompFightExpBar.xml" xy="33,1685">
-      <relation target="" sidePair="bottom-bottom"/>
-    </component>
-    <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>
+    <graph id="n1_8xpg" name="btnClose" xy="0,0" size="1080,1920" alpha="0" type="rect" fillColor="#ffff0000"/>
   </displayList>
-  <transition name="t0" autoPlay="true">
+  <transition name="t0">
     <item time="0" type="Alpha" target="n0_8xpg" tween="true" startValue="0" endValue="1" duration="6" ease="Quad.In"/>
     <item time="0" type="Alpha" target="n2_8xpg" tween="true" startValue="0" endValue="1" duration="6"/>
-    <item time="0" type="XY" target="n0_8xpg" tween="true" startValue="8,-813" endValue="8,47" duration="5" ease="Quad.In"/>
-    <item time="0" type="XY" target="n2_8xpg" tween="true" startValue="33,2105" endValue="33,1665" duration="6" ease="Quad.In"/>
-    <item time="5" type="XY" target="n0_8xpg" tween="true" startValue="8,47" endValue="8,17" duration="2"/>
-    <item time="6" type="XY" target="n2_8xpg" tween="true" startValue="33,1665" endValue="33,1685" duration="2"/>
+    <item time="0" type="XY" target="n0_8xpg" tween="true" startValue="8,-813" endValue="8,47" duration="6" ease="Bounce.Out"/>
+    <item time="0" type="XY" target="n2_8xpg" tween="true" startValue="33,2105" endValue="33,1665" duration="6" label2="posY" ease="Bounce.Out"/>
   </transition>
 </component>

FGUIProject/assets/Main/StoryFightSingleScoreUI.xml

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

FGUIProject/assets/Main/StoryFightTargetScoreUI.xml

@@ -1,65 +1,78 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920" designImage="ui://mfvz4q8kmza1c0">
   <displayList>
-    <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="n0_8xpg" name="selfScore" src="8xpg4e" fileName="components/CompFightScore.xml" xy="133,843" visible="false">
-      <relation target="" sidePair="center-center,middle-middle"/>
+    <component id="n37_mhyh" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="52,80"/>
+    <component id="n28_uj53" name="proScore" src="v3k9c7" fileName="components/ProgressBarTargetScore.xml" xy="170,80">
+      <ProgressBar max="100"/>
     </component>
-    <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 id="n17_mza1" name="comMineCircle" src="c2umeg" fileName="components/comMineCircle.xml" xy="380,1428" pivot="0.5,0.5" anchor="true" visible="false">
+      <relation target="" sidePair="bottom-bottom"/>
     </component>
-    <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 id="n15_mza1" name="comTargetCircle" src="v3k9c4" fileName="components/comTargetCircle.xml" xy="700,1428" pivot="0.5,0.5" anchor="true" visible="false">
+      <relation target="" sidePair="bottom-bottom"/>
     </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="157,883"/>
-    <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">
+    <component id="n24_vbe8" name="proMinusMine" src="mhyhd4" fileName="components/ProgressBar2.xml" xy="190,700">
       <ProgressBar value="100" max="100"/>
     </component>
-    <component id="n26_vbe8" name="proMinusNpc" src="mhyhd4" fileName="components/ProgressBar2.xml" xy="708,820">
+    <component id="n26_vbe8" name="proMinusNpc" src="mhyhd4" fileName="components/ProgressBar2.xml" xy="710,700">
       <ProgressBar value="100" max="100"/>
     </component>
-    <component id="n29_uj53" name="ComRoleSkillMineAdd" src="v3k9cx" fileName="components/ComRoleSkill.xml" xy="60,914"/>
-    <component id="n34_pcn0" name="ComRoleSkillMineMinus" src="lki4db" fileName="components/ComRoleSkill1.xml" xy="40,914" controller="c1,0"/>
-    <component id="n33_uj53" name="ComRoleSkillNpcAdd" src="v3k9cx" fileName="components/ComRoleSkill.xml" xy="590,914"/>
-    <component id="n35_pcn0" name="ComRoleSkillNpcMinus" src="lki4db" fileName="components/ComRoleSkill1.xml" xy="40,914" controller="c1,1"/>
-    <component id="n1_8xpg" name="selfName" src="8xpg41" fileName="components/CompFightResultName.xml" xy="48,1499">
+    <component id="n25_vbe8" name="ComShieldMine" src="v3k9c3" fileName="components/ComSkillShield.xml" xy="230,820"/>
+    <component id="n27_vbe8" name="ComShieldNpc" src="v3k9c3" fileName="components/ComSkillShield.xml" xy="750,820"/>
+    <component id="n29_uj53" name="ComRoleSkillMineAdd" src="v3k9cx" fileName="components/ComRoleSkill.xml" xy="230,1132" group="n43_k1kh"/>
+    <component id="n34_pcn0" name="ComRoleSkillMineMinus" src="v3k9cx" fileName="components/ComRoleSkill.xml" xy="230,1132" group="n43_k1kh"/>
+    <component id="n33_uj53" name="ComRoleSkillNpcAdd" src="v3k9cx" fileName="components/ComRoleSkill.xml" xy="750,1132" group="n43_k1kh"/>
+    <component id="n35_pcn0" name="ComRoleSkillNpcMinus" src="v3k9cx" fileName="components/ComRoleSkill.xml" xy="750,1132" group="n43_k1kh"/>
+    <component id="n39_k1kh" name="ComRoleSkillMineBreak" src="lki4db" fileName="components/ComRoleSkill1.xml" xy="230,1132" group="n43_k1kh"/>
+    <component id="n40_k1kh" name="ComRoleSkillNpcBreak" src="lki4db" fileName="components/ComRoleSkill1.xml" xy="750,1132" group="n43_k1kh"/>
+    <component id="n41_k1kh" name="ComRoleSkillMineShield" src="lki4db" fileName="components/ComRoleSkill1.xml" xy="230,1132" group="n43_k1kh"/>
+    <component id="n42_k1kh" name="ComRoleSkillNpcShield" src="lki4db" fileName="components/ComRoleSkill1.xml" xy="750,1132" group="n43_k1kh"/>
+    <group id="n43_k1kh" name="n43" xy="230,1132" size="620,100"/>
+    <component id="n1_8xpg" name="selfName" src="8xpg41" fileName="components/CompFightResultName.xml" xy="48,1499" visible="false">
       <relation target="" sidePair="bottom-bottom"/>
     </component>
-    <component id="n4_8xpg" name="targetName" src="8xpg41" fileName="components/CompFightResultName.xml" xy="596,1499">
+    <component id="n4_8xpg" name="targetName" src="8xpg41" fileName="components/CompFightResultName.xml" xy="596,1499" visible="false">
       <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"/>
+      <property target="icon" propertyId="1" value="ui://mfvz4q8kv3k9cc"/>
+      <property target="icon1" propertyId="1" value="ui://mfvz4q8kk1khe1"/>
     </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"/>
+      <property target="icon" propertyId="1" value="ui://mfvz4q8kv3k9cd"/>
+      <property target="icon1" propertyId="1" value="ui://mfvz4q8kk1khe2"/>
     </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"/>
+      <property target="icon" propertyId="1" value="ui://mfvz4q8kv3k9ce"/>
+      <property target="icon1" propertyId="1" value="ui://mfvz4q8kk1khe3"/>
     </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"/>
+      <property target="icon" propertyId="1" value="ui://mfvz4q8kv3k9cf"/>
+      <property target="icon1" propertyId="1" value="ui://mfvz4q8kk1khe4"/>
     </component>
     <component id="n38_jj0m" name="btnSpeedUp" src="jj0mdl" fileName="componentsDialog/ButtonSpeedUp1.xml" xy="943,1546">
       <relation target="" sidePair="right-right,bottom-bottom"/>
       <Button title="x1"/>
     </component>
+    <graph id="n44_t6aj" name="holderPartScore" xy="380,1428" size="1,1" group="n46_t6aj" visible="false">
+      <relation target="n17_mza1" sidePair="bottom-bottom"/>
+    </graph>
+    <graph id="n45_t6aj" name="holderPartScoreNpc" xy="700,1426" size="1,1" group="n46_t6aj" visible="false">
+      <relation target="n15_mza1" sidePair="bottom-bottom"/>
+    </graph>
+    <graph id="n47_wgy9" name="holderAddScore" xy="320,1132" size="1,1" group="n46_t6aj" visible="false">
+      <relation target="n29_uj53" sidePair="bottom-bottom"/>
+    </graph>
+    <graph id="n48_wgy9" name="holderAddScoreNpc" xy="750,1132" size="1,1" group="n46_t6aj" visible="false">
+      <relation target="n34_pcn0" sidePair="bottom-bottom"/>
+    </graph>
+    <group id="n46_t6aj" name="n46" xy="320,1132" size="431,297"/>
   </displayList>
 </component>

FGUIProject/assets/Main/components/ComBtnSkill.xml

@@ -2,26 +2,27 @@
 <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>
+    <loader id="n22_uxaj" name="icon" xy="106,106" pivot="0.5,0.5" anchor="true" size="196,196" aspect="true" url="ui://mfvz4q8kv3k9cc" fill="scaleMatchHeight" autoSize="true"/>
+    <loader id="n32_k1kh" name="icon1" xy="105,187" pivot="0.5,0.5" anchor="true" size="105,50" aspect="true" url="ui://mfvz4q8kk1khe1" fill="scaleMatchHeight" autoSize="true"/>
     <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">
+    <image id="n26_v3k9" name="n26" src="k1khe5" fileName="imagesStory/zd_txtxtx.png" xy="-22,-22" pivot="0.5,0.5" visible="false">
       <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">
+    <image id="n29_k1kh" name="n29" src="k1khe0" fileName="imagesStory/zd_cishukuang.png" xy="155,8"/>
+    <text id="n30_k1kh" name="txtCount" xy="172,14" pivot="0.5,0" size="23,42" fontSize="30" color="#fbf4ed" align="center" bold="true" text="1"/>
+    <graph id="n31_k1kh" name="holder" xy="56,56" pivot="0.5,0.5" size="100,100" touchable="false">
       <gearDisplay controller="c1" pages="0"/>
-    </image>
+    </graph>
   </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"/>
+    <item time="0" type="Scale" target="n26_v3k9" tween="true" startValue="1,1" endValue="0.9,0.9" duration="18" ease="Linear"/>
+    <item time="4" type="Alpha" target="n26_v3k9" tween="true" startValue="1" endValue="0.5" duration="14" ease="Linear"/>
+    <item time="18" type="Alpha" target="n26_v3k9" tween="true" startValue="0.5" endValue="1" duration="14"/>
+    <item time="18" type="Scale" target="n26_v3k9" tween="true" startValue="0.9,0.9" endValue="1,1" duration="18" ease="Linear"/>
+    <item time="36" type="Alpha" target="n26_v3k9" value="1"/>
   </transition>
   <customProperty target="icon" propertyId="1"/>
   <customProperty target="icon1" propertyId="1"/>

FGUIProject/assets/Main/components/ComRoleSkill.xml

@@ -1,16 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="400,450">
+<component size="100,100">
   <displayList>
-    <image id="n30_v3k9" name="n30" src="v3k9cb" fileName="imagesStory/zd_jinengdi_1.png" xy="128,0" pivot="0.5,0.5" size="243,243" group="n34_lki4" aspect="true"/>
-    <text id="n33_lki4" name="txtResult" xy="94,123" pivot="0.5,0.5" anchor="true" size="68,114" group="n34_lki4" font="ui://mfvz4q8kvuz5b5" fontSize="110" color="#5dd05d" vars="true" text="+"/>
-    <text id="n29_uj53" name="txtScore" xy="249,122" pivot="0.5,0.5" anchor="true" size="203,74" group="n34_lki4" font="ui://mfvz4q8kvuz5b5" fontSize="70" color="#5dd05d" align="center" vars="true" autoSize="none" text="{count=9000}"/>
-    <group id="n34_lki4" name="n34" xy="60,0" size="311,243" advanced="true"/>
-    <image id="n31_v3k9" name="n31" src="v3k9cg" fileName="imagesStory/zd_jnsxzi_1.png" xy="100,357" pivot="0.5,0.5"/>
+    <graph id="n35_k1kh" name="holder" xy="0,0" pivot="0.5,0.5" size="100,100"/>
+    <text id="n29_uj53" name="txtScore" xy="136,-80" pivot="0.5,0.5" anchor="true" size="133,60" font="ui://mfvz4q8kk1khe6" fontSize="70" color="#5dd05d" align="center" vars="true" text="{count=900}"/>
   </displayList>
   <transition name="t0">
-    <item time="0" type="Alpha" target="n34_lki4" value="0"/>
-    <item time="0" type="Scale" target="n31_v3k9" tween="true" startValue="1.6,1.6" endValue="1,1" duration="6" ease="Bounce.Out"/>
-    <item time="6" type="Alpha" target="n34_lki4" tween="true" startValue="1" endValue="0" duration="18" ease="Quart.In"/>
-    <item time="6" type="XY" target="n34_lki4" tween="true" startValue="60,0" endValue="60,-250" duration="18" ease="Linear"/>
+    <item time="0" type="Visible" target="n29_uj53" value="false"/>
+    <item time="15" type="Scale" target="n29_uj53" tween="true" startValue="1.2,1.2" endValue="1,1" duration="6" ease="Bounce.Out"/>
+    <item time="15" type="Visible" target="n29_uj53" value="true"/>
+    <item time="36" type="Visible" target="n29_uj53" value="true"/>
   </transition>
 </component>

FGUIProject/assets/Main/components/ComRoleSkill1.xml

@@ -1,27 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1000,450">
-  <controller name="c1" exported="true" pages="0,,1," selected="1"/>
+<component size="100,100">
+  <controller name="c1" exported="true" pages="0,,1," selected="0"/>
   <displayList>
-    <image id="n30_v3k9" name="n30" src="v3k9cb" fileName="imagesStory/zd_jinengdi_1.png" xy="148,0" pivot="0.5,0.5" size="243,243" group="n34_lki4" aspect="true"/>
-    <text id="n33_lki4" name="txtResult" xy="114,123" pivot="0.5,0.5" anchor="true" size="68,114" group="n34_lki4" font="ui://mfvz4q8kvuz5b5" fontSize="110" color="#5dd05d" vars="true" text="-"/>
-    <text id="n29_uj53" name="txtScore" xy="269,121" pivot="0.5,0.5" anchor="true" size="203,74" group="n34_lki4" font="ui://mfvz4q8kvuz5b5" fontSize="70" color="#5dd05d" align="center" vars="true" autoSize="none" text="{count=90}"/>
-    <group id="n34_lki4" name="n34" xy="80,0" size="311,243" advanced="true">
-      <gearXY controller="c1" pages="1" values="80,0" default="610,0"/>
-    </group>
-    <image id="n31_v3k9" name="n31" src="v3k9ch" fileName="imagesStory/zd_jnsxzi_2.png" xy="660,357" pivot="0.5,0.5">
-      <gearXY controller="c1" pages="0" values="120,357" default="660,357"/>
-    </image>
+    <graph id="n35_k1kh" name="holder" xy="0,0" pivot="0.5,0.5" size="100,100"/>
   </displayList>
   <transition name="t0">
-    <item time="0" type="Alpha" target="n34_lki4" value="0"/>
-    <item time="0" type="Scale" target="n31_v3k9" tween="true" startValue="1.6,1.6" endValue="1,1" duration="6" ease="Bounce.Out"/>
-    <item time="6" type="Alpha" target="n34_lki4" tween="true" startValue="1" endValue="0" duration="18" ease="Quart.In"/>
-    <item time="6" type="XY" target="n34_lki4" tween="true" startValue="610,0" endValue="610,-250" duration="18" ease="Linear"/>
-  </transition>
-  <transition name="t1">
-    <item time="0" type="Alpha" target="n34_lki4" value="0"/>
-    <item time="0" type="Scale" target="n31_v3k9" tween="true" startValue="1.6,1.6" endValue="1,1" duration="6" ease="Bounce.Out"/>
-    <item time="6" type="Alpha" target="n34_lki4" tween="true" startValue="1" endValue="0" duration="18" ease="Quart.In"/>
-    <item time="6" type="XY" target="n34_lki4" tween="true" startValue="80,0" endValue="80,-250" duration="18" ease="Linear"/>
+    <item time="0" type="Visible" target="n35_k1kh" value="true"/>
+    <item time="24" type="Visible" target="n35_k1kh" value="true"/>
   </transition>
 </component>

FGUIProject/assets/Main/components/ComScoreResult.xml

@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="256,259">
-  <controller name="c1" pages="0,,1,,2," selected="2"/>
+  <controller name="c1" pages="0,,1,,2," selected="0"/>
   <displayList>
-    <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="119,63" url="ui://mfvz4q8kvuz5be" autoSize="true">
+    <graph id="n14_ecw3" name="holder2" xy="133,135" size="1,1">
+      <gearDisplay controller="c1" pages="0"/>
+    </graph>
+    <graph id="n12_c2um" name="holder" xy="127,129" size="1,1">
+      <gearDisplay controller="c1" pages="1"/>
+    </graph>
+    <graph id="n13_c2um" name="holder1" xy="137,137" size="1,1">
+      <gearDisplay controller="c1" pages="2"/>
+    </graph>
+    <loader id="n8_vuz5" name="loaType" xy="69,54" size="118,63" url="ui://mfvz4q8kvuz5bf" 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="51" align="center" text="666666">
@@ -17,5 +23,24 @@
     <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>
+    <graph id="n15_ez2u" name="graph" xy="133,93" size="1,1">
+      <gearDisplay controller="c1" pages="1"/>
+    </graph>
   </displayList>
+  <transition name="t0" autoPlay="true">
+    <item time="0" type="Visible" target="n10_vuz5" value="false"/>
+    <item time="0" type="Visible" target="n11_vuz5" value="false"/>
+    <item time="0" type="Visible" target="n15_ez2u" value="false"/>
+    <item time="0" type="Visible" target="n8_vuz5" value="false"/>
+    <item time="0" type="Visible" target="n9_vuz5" value="false"/>
+    <item time="14" type="Visible" target="n10_vuz5" value="true"/>
+    <item time="14" type="Visible" target="n11_vuz5" value="true"/>
+    <item time="14" type="Visible" target="n8_vuz5" value="true"/>
+    <item time="14" type="Visible" target="n9_vuz5" value="true"/>
+    <item time="42" type="Visible" target="n10_vuz5" value="false"/>
+    <item time="42" type="Visible" target="n11_vuz5" value="false"/>
+    <item time="42" type="Visible" target="n8_vuz5" value="false"/>
+    <item time="42" type="Visible" target="n9_vuz5" value="false"/>
+    <item time="48" type="Visible" target="n15_ez2u" value="false"/>
+  </transition>
 </component>

FGUIProject/assets/Main/components/ComSkillShield.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="244,237">
+<component size="100,100">
   <displayList>
-    <graph id="n26_tr2r" name="holder" xy="122,118" size="0,0" touchable="false">
+    <graph id="n26_tr2r" name="holder" xy="0,0" pivot="0.5,0.5" size="100,100" touchable="false">
       <relation target="" sidePair="height-height"/>
     </graph>
-    <graph id="n27_tr2r" name="holder1" xy="122,118" size="0,0" visible="false" touchable="false">
+    <graph id="n27_tr2r" name="holder1" xy="0,0" pivot="0.5,0.5" size="100,100" visible="false" touchable="false">
       <relation target="" sidePair="height-height"/>
     </graph>
   </displayList>

FGUIProject/assets/Main/components/CompFightScore.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="242,234">
   <displayList>
-    <image id="n0_8xpg" name="n0" src="8xpg3z" fileName="imagesStory/zd_drpf_fsz_1.png" xy="0,0"/>
     <text id="n5_8xpg" name="txtScore" xy="22,87" size="198,60" font="ui://mfvz4q8k8xpg42" fontSize="38" color="#ffffff" align="center" autoSize="none" autoClearText="true" text="99999"/>
   </displayList>
 </component>

FGUIProject/assets/Main/components/Component2.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="836,24">
+  <displayList>
+    <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">
+      <relation target="" sidePair="right-right"/>
+    </image>
+    <graph id="n7_k1kh" name="holder" xy="835,11" pivot="0.5,0.5" size="1,1">
+      <relation target="" sidePair="right-right"/>
+    </graph>
+    <graph id="n8_ecw3" name="holder1" xy="417,11" pivot="0.5,0.5" size="1,1"/>
+  </displayList>
+</component>

FGUIProject/assets/Main/components/Component3.xml

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

FGUIProject/assets/Main/components/Component4.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="705,28" overflow="hidden">
+  <displayList>
+    <image id="n1_mueb" name="bar" src="muebed" fileName="images/sjsd_ss_2.png" xy="0,0"/>
+  </displayList>
+</component>

FGUIProject/assets/Main/components/ProgressBar1.xml

@@ -1,17 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="948,30" extention="ProgressBar">
+<component size="836,43" extention="ProgressBar">
   <displayList>
-    <image id="n0_vuz5" name="n0" src="vuz5ba" fileName="imagesStory/zd_pfjdt_1.png" xy="0,0">
+    <image id="n0_vuz5" name="n0" src="v3k9cq" fileName="imagesStory/zd_zdjdt_1.png" xy="-17,0">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <image id="n1_vuz5" name="bar" src="vuz5bb" fileName="imagesStory/zd_pfjdt_2.png" xy="0,2"/>
-    <text id="n2_vuz5" name="txtCount" xy="32,-4" size="238,36" fontSize="26" color="#fff6ee" vAlign="middle" autoSize="none" text="总分：0">
-      <relation target="" sidePair="width-width,height-height"/>
-    </text>
-    <image id="n3_vuz5" name="ani" src="vuz5bc" fileName="imagesStory/zd_pfjdt_3.png" xy="933,-12">
-      <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"/>
+    <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"/>
   </displayList>
   <ProgressBar titleType="value"/>
 </component>

FGUIProject/assets/Main/components/ProgressBarCD.xml

@@ -1,8 +1,8 @@
 <?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">
+    <image id="n2_v3k9" name="n2" src="v3k9ca" fileName="imagesStory/zd_daoshu_2.png" xy="22,22"/>
+    <image id="n1_vbe8" name="bar" src="v3k9c9" fileName="imagesStory/zd_daoshu_1.png" xy="22,22" fillMethod="radial360" fillOrigin="1" fillClockwise="false">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
   </displayList>

FGUIProject/assets/Main/components/ProgressBarTargetScore.xml

@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="852,30" extention="ProgressBar">
+<component size="836,43" extention="ProgressBar">
   <displayList>
-    <image id="n0_uj53" name="n0" src="vuz5ba" fileName="imagesStory/zd_pfjdt_1.png" xy="0,0" size="852,30">
+    <image id="n0_uj53" name="n0" src="v3k9cq" fileName="imagesStory/zd_zdjdt_1.png" xy="-17,0">
       <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">
+    <image id="n7_v3k9" name="n7" src="v3k9cs" fileName="imagesStory/zd_zdjdt_3.png" xy="0,9" flip="hz"/>
+    <component id="n1_uj53" name="comBar" src="k1khe7" fileName="components/Component2.xml" xy="0,9" size="836,24"/>
+    <text id="n4_uj53" name="txtMineScore" xy="10,50" size="148,44" font="ui://eg2y0ldpk1kha2" fontSize="32" color="#fcf5ec" vAlign="bottom" strokeColor="#796135" strokeSize="2" 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">
+    <text id="n5_uj53" name="txtNpcScore" xy="826,50" pivot="1,0" anchor="true" size="180,44" font="ui://eg2y0ldpk1kha2" fontSize="32" color="#fcf5ec" align="right" vAlign="bottom" strokeColor="#796135" strokeSize="2" 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/comClickCircle.xml

@@ -1,23 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="244,237">
+<component size="180,180">
+  <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
-    <loader id="n13_vuz5" name="loaCircle" xy="-59,-72" pivot="0.5,0.5" size="362,382" group="n12_vuz5" scale="0.5,0.5" url="ui://mfvz4q8kvuz5bk"/>
-    <image id="n11_vuz5" name="imgCircle" src="vuz5bj" fileName="imagesStory/zd_pfguang_2.png" xy="-59,-72" pivot="0.5,0.5" size="362,382" group="n12_vuz5" aspect="true"/>
-    <group id="n12_vuz5" name="grpCircle" xy="-59,-72" size="362,382" advanced="true"/>
-    <component id="n7_vuz5" name="ComScoreResult" src="vuz5bi" fileName="components/ComScoreResult.xml" xy="-7,-8" visible="false"/>
+    <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="124,79" group="n12_vuz5" fontSize="60" color="#fdfbee" align="center" 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"/>
   </displayList>
-  <transition name="t0">
-    <item time="0" type="Scale" target="n11_vuz5" label="big" tween="true" startValue="1,1" endValue="0.5,0.5" duration="15" label2="small" ease="Linear"/>
-    <item time="0" type="Visible" target="n12_vuz5" value="true"/>
-    <item time="15" type="Scale" target="n11_vuz5" label="small" tween="true" startValue="0.5,0.5" endValue="0,0" duration="14" ease="Linear"/>
-    <item time="29" type="Visible" target="n12_vuz5" value="false"/>
-  </transition>
-  <transition name="t1">
-    <item time="0" type="Alpha" target="n7_vuz5" value="1"/>
-    <item time="0" type="Visible" target="n12_vuz5" value="false"/>
-    <item time="0" type="Visible" target="n7_vuz5" value="true"/>
-    <item time="0" type="XY" target="n7_vuz5" tween="true" startValue="-7,-8" endValue="-7,-259" duration="19" ease="Linear"/>
-    <item time="9" type="Alpha" target="n7_vuz5" tween="true" startValue="1" endValue="0" duration="10" ease="Linear"/>
-    <item time="19" type="Visible" target="n7_vuz5" value="false"/>
-  </transition>
 </component>

FGUIProject/assets/Main/components/comMineCircle.xml

@@ -1,18 +1,26 @@
 <?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"/>
+    <loader id="n16_v3k9" name="loaIcon" xy="-2,-4" size="256,259" visible="false" url="ui://mfvz4q8kvuz5b7" autoSize="true"/>
+    <graph id="n18_mueb" name="holder" xy="127,127" size="1,1"/>
     <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"/>
+    <text id="n15_mza1" name="txtCount" xy="64,124" pivot="0.5,0.5" size="127,60" font="ui://mfvz4q8kvuz5b3" fontSize="56" color="#fdfbee" align="center" vAlign="middle" 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"/>
+    <item time="0" type="Visible" target="n15_mza1" value="false"/>
+    <item time="0" type="Visible" target="n16_v3k9" value="false"/>
+    <item time="0" type="Visible" target="n17_v3k9" value="false"/>
+    <item time="0" type="Visible" target="n18_mueb" value="true"/>
+    <item time="14" type="Visible" target="n15_mza1" value="true"/>
+    <item time="14" type="Visible" target="n16_v3k9" value="true"/>
+    <item time="14" type="Visible" target="n17_v3k9" value="true"/>
+    <item time="42" type="Visible" target="n15_mza1" value="false"/>
+    <item time="42" type="Visible" target="n16_v3k9" value="false"/>
+    <item time="42" type="Visible" target="n17_v3k9" value="false"/>
+    <item time="45" type="Visible" target="n18_mueb" value="true"/>
+  </transition>
+  <transition name="t1">
+    <item time="0" type="Visible" target="n18_mueb" value="true"/>
+    <item time="42" type="Visible" target="n18_mueb" value="true"/>
   </transition>
 </component>

FGUIProject/assets/Main/components/comTargetCircle.xml

@@ -1,18 +1,26 @@
 <?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"/>
+    <loader id="n16_v3k9" name="loaIcon" xy="-2,-4" size="256,259" visible="false" url="ui://mfvz4q8kvuz5b6" autoSize="true"/>
+    <graph id="n18_mueb" name="holder" xy="127,127" size="1,1"/>
     <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"/>
+    <text id="n15_mza1" name="txtCount" xy="64,124" pivot="0.5,0.5" size="127,60" font="ui://mfvz4q8kvuz5b2" fontSize="56" color="#fdfbee" align="center" vAlign="middle" 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"/>
+    <item time="0" type="Visible" target="n15_mza1" value="false"/>
+    <item time="0" type="Visible" target="n16_v3k9" value="false"/>
+    <item time="0" type="Visible" target="n17_v3k9" value="false"/>
+    <item time="0" type="Visible" target="n18_mueb" value="true"/>
+    <item time="14" type="Visible" target="n15_mza1" value="true"/>
+    <item time="14" type="Visible" target="n16_v3k9" value="true"/>
+    <item time="14" type="Visible" target="n17_v3k9" value="true"/>
+    <item time="42" type="Visible" target="n15_mza1" value="false"/>
+    <item time="42" type="Visible" target="n16_v3k9" value="false"/>
+    <item time="42" type="Visible" target="n17_v3k9" value="false"/>
+    <item time="45" type="Visible" target="n18_mueb" value="true"/>
+  </transition>
+  <transition name="t1">
+    <item time="0" type="Visible" target="n18_mueb" value="true"/>
+    <item time="30" type="Visible" target="n18_mueb" value="true"/>
   </transition>
 </component>

FGUIProject/assets/Main/package.xml

@@ -42,7 +42,6 @@
     <image id="v35420" name="zx_gka_guang.png" path="/imagesStory/"/>
     <image id="v35421" name="zx_gka_szkuang.png" path="/imagesStory/"/>
     <image id="v35422" name="zx_gka_xing_1.png" path="/imagesStory/"/>
-    <image id="v35423" name="zx_gka_xing_2.png" path="/imagesStory/"/>
     <image id="v35424" name="zx_gka_zb_1.png" path="/imagesExport/" exported="true"/>
     <image id="v35425" name="zx_gka_zb_2.png" path="/imagesExport/" exported="true"/>
     <image id="v35426" name="zx_gka_zshuk.png" path="/imagesStory/"/>
@@ -78,16 +77,12 @@
     <component id="xt5s35" name="StoryLookBackUI.xml" path="/" exported="true"/>
     <component id="xt5s36" name="CompLookBackContent.xml" path="/componentsDialog/"/>
     <component id="vxw538" name="StoryLevelInfoUI.xml" path="/" exported="true"/>
-    <image id="t8o13b" name="zx_jq_zytdik_1.png" path="/imagesStory/"/>
     <image id="t8o13c" name="zx_jqgka_anks_1.png" path="/imagesStory/"/>
-    <image id="t8o13f" name="zx_jq_djdikmo.png" path="/imagesStory/"/>
     <image id="t8o13g" name="zx_jq_djtubiao_1.png" path="/imagesStory/"/>
     <component id="t8o13i" name="ButtonStart.xml" path="/componentsLevel/"/>
-    <image id="pal53m" name="zx_jq_rwbszik.png" path="/imagesStory/"/>
     <component id="8xpg3o" name="StoryFightTargetUI.xml" path="/" exported="true"/>
     <image id="8xpg3p" name="zd_dz_jm_z.png" path="/imagesStory/"/>
     <image id="8xpg3q" name="zd_dz_mz_1.png" path="/imagesStory/"/>
-    <image id="8xpg3r" name="zd_dz_mz_2.png" path="/imagesStory/"/>
     <component id="8xpg3s" name="CompFightNameRole.xml" path="/components/"/>
     <component id="8xpg3t" name="CompFightNameTarget.xml" path="/components/"/>
     <component id="8xpg3u" name="CompAnimationFightIcon.xml" path="/components/"/>
@@ -95,7 +90,6 @@
     <component id="8xpg3w" name="StoryFightTargetScoreUI.xml" path="/" exported="true"/>
     <component id="8xpg3x" name="StoryFightSingleScoreUI.xml" path="/" exported="true"/>
     <component id="8xpg3y" name="StoryFightResultUI.xml" path="/" exported="true"/>
-    <image id="8xpg3z" name="zd_drpf_fsz_1.png" path="/imagesStory/"/>
     <image id="8xpg40" name="zd_pf_zidi_1.png" path="/imagesStory/"/>
     <component id="8xpg41" name="CompFightResultName.xml" path="/components/"/>
     <font id="8xpg42" name="Font1.fnt" path="/Font1/" exported="true"/>
@@ -154,8 +148,6 @@
     <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"/>
-    <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="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/"/>
@@ -331,27 +323,15 @@
     <component id="v3k9c7" name="ProgressBarTargetScore.xml" path="/components/"/>
     <image id="v3k9c9" name="zd_daoshu_1.png" path="/imagesStory/"/>
     <image id="v3k9ca" name="zd_daoshu_2.png" path="/imagesStory/"/>
-    <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/"/>
@@ -374,6 +354,33 @@
     <component id="lqp0dm" name="ComBtn.xml" path="/components/"/>
     <image id="kqhddn" name="zjm_rk_7.png" path="/images/"/>
     <image id="kqhddo" name="zjm_rk_6.png" path="/images/"/>
+    <image id="k1khdp" name="zd_zdjdt_liang.png" path="/imagesStory/"/>
+    <image id="k1khdq" name="zdsz_0.png" path="/Font5/"/>
+    <image id="k1khdr" name="zdsz_1.png" path="/Font5/"/>
+    <image id="k1khds" name="zdsz_2.png" path="/Font5/"/>
+    <image id="k1khdt" name="zdsz_3.png" path="/Font5/"/>
+    <image id="k1khdu" name="zdsz_4.png" path="/Font5/"/>
+    <image id="k1khdv" name="zdsz_5.png" path="/Font5/"/>
+    <image id="k1khdw" name="zdsz_6.png" path="/Font5/"/>
+    <image id="k1khdx" name="zdsz_7.png" path="/Font5/"/>
+    <image id="k1khdy" name="zdsz_8.png" path="/Font5/"/>
+    <image id="k1khdz" name="zdsz_9.png" path="/Font5/"/>
+    <image id="k1khe0" name="zd_cishukuang.png" path="/imagesStory/"/>
+    <image id="k1khe1" name="zd_jingzi_1.png" path="/imagesStory/"/>
+    <image id="k1khe2" name="zd_jingzi_2.png" path="/imagesStory/"/>
+    <image id="k1khe3" name="zd_jingzi_3.png" path="/imagesStory/"/>
+    <image id="k1khe4" name="zd_jingzi_4.png" path="/imagesStory/"/>
+    <image id="k1khe5" name="zd_txtxtx.png" path="/imagesStory/"/>
+    <font id="k1khe6" name="Font9.fnt" path="/Font5/" exported="true"/>
+    <component id="k1khe7" name="Component2.xml" path="/components/"/>
+    <component id="k1khe8" name="Component3.xml" path="/components/"/>
+    <image id="k1khe9" name="zdsz_10.png" path="/Font5/"/>
+    <image id="k1khea" name="zdsz_11.png" path="/Font5/"/>
+    <image id="muebeb" name="sjsd_ss_3.png" path="/images/"/>
+    <image id="muebec" name="sjsd_ss_1.png" path="/images/"/>
+    <image id="muebed" name="sjsd_ss_2.png" path="/images/"/>
+    <component id="muebef" name="Component4.xml" path="/components/"/>
+    <component id="c2umeg" name="comMineCircle.xml" path="/components/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/RoleLvUp/RoleLvUpUI.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="700,900">
+  <displayList>
+    <image id="n0_mueb" name="n0" src="mueb2" fileName="images/sjsd_kuangdi_1.png" xy="12,0"/>
+    <text id="n1_mueb" name="txtLv" xy="350,307" pivot="0.5,0.5" anchor="true" size="190,192" fontSize="150" color="#cda45f" text="35"/>
+    <text id="n4_mueb" name="n4" xy="185,635" size="62,49" group="n7_mueb" fontSize="36" color="#e4c084" text="LV."/>
+    <text id="n3_mueb" name="txtLastLv" xy="240,599" size="93,94" group="n7_mueb" fontSize="72" color="#e4c084" text="34"/>
+    <text id="n5_mueb" name="n5" xy="326,624" size="47,49" group="n7_mueb" fontSize="36" color="#e4c084" text="&gt;&gt;"/>
+    <text id="n6_mueb" name="n6" xy="366,635" size="62,49" group="n7_mueb" fontSize="36" color="#e4c084" text="LV."/>
+    <text id="n2_mueb" name="txtCurLv" xy="421,599" size="93,94" group="n7_mueb" fontSize="72" color="#e4c084" text="35"/>
+    <group id="n7_mueb" name="n7" xy="185,599" size="329,94" advanced="true" layout="hz" colGap="-7" excludeInvisibles="true">
+      <relation target="" sidePair="center-center"/>
+    </group>
+    <component id="n8_mueb" name="com0" src="mueb4" fileName="components/Component1.xml" xy="92,723" group="n11_mueb"/>
+    <component id="n10_mueb" name="com1" src="mueb5" fileName="components/Component2.xml" xy="92,819" group="n11_mueb"/>
+    <group id="n11_mueb" name="n11" xy="92,723" size="516,158" advanced="true" layout="vt" lineGap="34" excludeInvisibles="true"/>
+  </displayList>
+</component>

FGUIProject/assets/RoleLvUp/components/Component1.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="516,62">
+  <displayList>
+    <image id="n8_mueb" name="n8" src="mueb3" fileName="images/sjsd_kuangdi_2.png" xy="0,0"/>
+    <text id="n9_mueb" name="n9" xy="42,4" size="164,54" fontSize="40" color="#82673e" text="体力上限"/>
+    <text id="n10_mueb" name="txtCount" xy="412,4" pivot="1,0.5" size="53,54" fontSize="40" color="#82673e" text="+3"/>
+  </displayList>
+</component>

FGUIProject/assets/RoleLvUp/components/Component2.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="516,62">
+  <displayList>
+    <image id="n8_mueb" name="n8" src="mueb1" fileName="images/sjsd_kuangdi_3.png" xy="0,0"/>
+    <text id="n9_mueb" name="n9" xy="42,4" size="164,54" fontSize="40" color="#906633" text="赠送体力"/>
+    <text id="n10_mueb" name="txtCount" xy="412,4" pivot="1,0.5" size="53,54" fontSize="40" color="#906633" text="+3"/>
+  </displayList>
+</component>

FGUIProject/assets/RoleLvUp/package.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packageDescription id="ns2d6qb2">
+  <resources>
+    <component id="mueb0" name="RoleLvUpUI.xml" path="/" exported="true"/>
+    <image id="mueb1" name="sjsd_kuangdi_3.png" path="/images/"/>
+    <image id="mueb2" name="sjsd_kuangdi_1.png" path="/images/"/>
+    <image id="mueb3" name="sjsd_kuangdi_2.png" path="/images/"/>
+    <component id="mueb4" name="Component1.xml" path="/components/"/>
+    <component id="mueb5" name="Component2.xml" path="/components/"/>
+  </resources>
+  <publish name="" path="..\GameClient\Assets\ResIn\UI\RoleLvUp" packageCount="2" genCode="true"/>
+</packageDescription>

GameClient/Assets/Editor/ArtsRes/ImportArtResTool.cs

@@ -14,7 +14,7 @@ namespace GFGEditor
         public static string ResRootPath { get { return $"../../../gfg/{ResRootDirName}/"; } }
         public static string ResRootPathDressUp { get { return $"../../../gfg/{ResRootDirNameDressUp}/"; } }
 
-        public static string ragule = @"^[0-9a-zA-Z_]{1,}$";
+        public static string ragule = @"^[0-9a-zA-Z_.]{1,}$";
         public static string Md5FilePath = "Assets/Res/MD5";
 
         private static string[] FieldGuideIconSrcPaths { get { return new string[] { ResRootPath + "图鉴/" }; } }

GameClient/Assets/Game/HotUpdate/Controller/ErrorCodeController.cs

@@ -42,7 +42,7 @@ namespace GFGGame
             }
             else if (ErrorCodeCfgArray.Instance.GetCfg(errorCode) != null)
             {
-                PromptController.Instance.ShowFloatTextPrompt(errorCode.ToString() + ErrorCodeCfgArray.Instance.GetCfg(errorCode).tips);
+                PromptController.Instance.ShowFloatTextPrompt(ErrorCodeCfgArray.Instance.GetCfg(errorCode).tips);
                 ET.Log.Error("errorCode" + errorCode.ToString());
                 return true;
             }

GameClient/Assets/Game/HotUpdate/Controller/LoginController.cs

@@ -125,6 +125,7 @@ namespace GFGGame
             }
             else
             {
+                GameGlobal.isFirstEntry = true;
                 ViewManager.Hide<ModalStatusView>();
                 GameController.ShowCreateRole();
             }

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

@@ -13,7 +13,8 @@ namespace GFGGame
         /// <returns></returns>
         public bool CheckIsFunOpenById(string functionId, bool showTips = true)
         {
-            FunctionOpenCfg cfg = FunctionOpenCfgArray.Instance.GetCfg(functionId);
+            string name = ViewManager.GetName(functionId);
+            FunctionOpenCfg cfg = FunctionOpenCfgArray.Instance.GetCfg(name);
             if (cfg == null)
             {
                 // Debug.LogWarning("g功能.xlsx  功能开启_FunctionOpenCfg  未添加  " + viewName + "  的配置");