Merge remote-tracking branch 'remotes/origin/master' into HybridCLR

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

FGUIProject/assets/ClothingSynthetic/ClothingSyntheticUI.xml

@@ -7,35 +7,37 @@
     <component id="n1_j539" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
     <component id="n43_g3nf" name="btnHome" src="qp4l60" fileName="components/ButtonHome.xml" pkg="eg2y0ldp" xy="36,220"/>
     <component id="n2_j539" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" pivot="1,0" controller="c1,6"/>
+    <component id="n40_ja9w" name="compHolder" src="ja9w1c" fileName="components/Component1.xml" xy="0,229" touchable="false">
+      <relation target="" sidePair="middle-middle"/>
+    </component>
+    <component id="n6_j539" name="compItemInfo" src="ja9w1f" fileName="components/CompItemInfo.xml" xy="735,237"/>
     <image id="n3_j539" name="n3" src="vek81n" fileName="images/hc_btkuang.png" xy="146,343" group="n46_v95q"/>
     <text id="n4_j539" name="txtSuitName" xy="162,387" size="46,199" group="n46_v95q" font="ui://eg2y0ldpwonotja" fontSize="38" color="#b38d58" autoSize="height" text="套装名字">
       <relation target="n3_j539" sidePair="center-center,middle-middle"/>
     </text>
     <group id="n46_v95q" name="n46" xy="146,343" size="78,418"/>
-    <component id="n40_ja9w" name="compHolder" src="ja9w1c" fileName="components/Component1.xml" xy="0,145"/>
-    <component id="n6_j539" name="compItemInfo" src="ja9w1f" fileName="components/CompItemInfo.xml" xy="735,237"/>
     <image id="n51_v95q" name="n51" src="v95q2c" fileName="images/hc_zzjsdi.png" xy="874,575" group="n53_v95q"/>
     <text id="n52_v95q" name="n52" xy="911,633" size="122,42" group="n53_v95q" fontSize="30" color="#c09d6b" text="制作进度"/>
     <text id="n27_j539" name="txtProgress" xy="920,680" pivot="0.5,0" size="102,44" group="n53_v95q" font="ui://eg2y0ldpwonotjc" fontSize="32" color="#d7847e" ubb="true" vars="true" text="10/20">
       <relation target="" sidePair="center-center"/>
     </text>
     <group id="n53_v95q" name="n53" xy="874,575" size="200,200"/>
-    <image id="n23_j539" name="n23" src="j539v" fileName="images/hc_kuang_5.png" xy="0,774"/>
-    <image id="n54_v95q" name="n54" src="j539s" fileName="images/hc_kuang_1.png" xy="15,985" group="n58_v95q"/>
-    <image id="n55_v95q" name="n55" src="j539s" fileName="images/hc_kuang_1.png" xy="286,985" group="n58_v95q"/>
-    <image id="n56_v95q" name="n56" src="j539s" fileName="images/hc_kuang_1.png" xy="557,985" group="n58_v95q"/>
-    <image id="n57_v95q" name="n57" src="j539s" fileName="images/hc_kuang_1.png" xy="828,985" group="n58_v95q"/>
-    <group id="n58_v95q" name="n58" xy="15,985" size="1051,291" advanced="true" layout="hz" colGap="33" excludeInvisibles="true"/>
-    <component id="n49_v95q" name="n49" src="v95qtjx" fileName="components/ComTopTitle.xml" pkg="eg2y0ldp" xy="342,829">
+    <image id="n23_j539" name="n23" src="j539v" fileName="images/hc_kuang_5.png" xy="0,853" size="1080,1067" group="n59_v95q"/>
+    <image id="n54_v95q" name="n54" src="j539s" fileName="images/hc_kuang_1.png" xy="15,1029" group="n58_v95q"/>
+    <image id="n55_v95q" name="n55" src="j539s" fileName="images/hc_kuang_1.png" xy="286,1029" group="n58_v95q"/>
+    <image id="n56_v95q" name="n56" src="j539s" fileName="images/hc_kuang_1.png" xy="557,1029" group="n58_v95q"/>
+    <image id="n57_v95q" name="n57" src="j539s" fileName="images/hc_kuang_1.png" xy="828,1029" group="n58_v95q"/>
+    <group id="n58_v95q" name="n58" xy="15,1029" size="1051,291" group="n59_v95q" advanced="true" layout="hz" colGap="33" excludeInvisibles="true"/>
+    <component id="n49_v95q" name="n49" src="v95qtjx" fileName="components/ComTopTitle.xml" pkg="eg2y0ldp" xy="342,914" group="n59_v95q">
       <property target="title" propertyId="0" value="所需材料"/>
     </component>
-    <list id="n37_ja9w" name="listMaterias" xy="0,969" size="1080,319" layout="row" scroll="horizontal" defaultItem="ui://4f294tdkv95q28">
+    <list id="n37_ja9w" name="listMaterias" xy="0,1012" size="1080,319" group="n59_v95q" layout="row" scroll="horizontal" defaultItem="ui://4f294tdkv95q28">
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
-    <list id="n30_j539" name="listClothing" xy="0,1590" size="1080,275" layout="row" overflow="scroll" scroll="horizontal" lineGap="30" defaultItem="ui://4f294tdkv95q2e" align="center" autoClearItems="true">
+    <list id="n30_j539" name="listClothing" xy="0,1590" size="1080,275" group="n59_v95q" layout="row" overflow="scroll" scroll="horizontal" lineGap="30" defaultItem="ui://4f294tdkv95q2e" align="center" autoClearItems="true">
       <item/>
       <item/>
       <item/>
@@ -43,9 +45,12 @@
       <item/>
       <item/>
     </list>
-    <component id="n21_j539" name="btnProduction" src="oqa1tjt" fileName="components/Button21.xml" pkg="eg2y0ldp" xy="355,1435">
+    <component id="n21_j539" name="btnProduction" src="oqa1tjt" fileName="components/Button21.xml" pkg="eg2y0ldp" xy="368,1435" group="n59_v95q">
       <Button title="制作"/>
     </component>
-    <component id="n48_v95q" name="comCostCurrency" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="418,1355"/>
+    <component id="n48_v95q" name="comCostCurrency" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="418,1369" group="n59_v95q"/>
+    <group id="n59_v95q" name="n59" xy="0,853" size="1080,1067" advanced="true">
+      <relation target="" sidePair="bottom-bottom"/>
+    </group>
   </displayList>
 </component>

FGUIProject/assets/ClothingSynthetic/package.xml

@@ -27,7 +27,7 @@
     <image id="j539r" name="hc_jdut_2.png" path="/images/"/>
     <image id="j539s" name="hc_kuang_1.png" path="/images/"/>
     <image id="j539u" name="hc_kuang_4.png" path="/imagesExport/" exported="true"/>
-    <image id="j539v" name="hc_kuang_5.png" path="/images/" scale="9grid" scale9grid="49,48,98,96"/>
+    <image id="j539v" name="hc_kuang_5.png" path="/images/" scale="9grid" scale9grid="49,261,98,337"/>
     <image id="j53911" name="hc_xiant_1.png" path="/images/"/>
     <image id="j53912" name="hc_yyy.png" path="/images/"/>
     <component id="j53918" name="Button3.xml" path="/components/"/>

FGUIProject/assets/CommonGame/GetSuitItemUI.xml

@@ -27,7 +27,7 @@
     <group id="n6_tu96" name="n6" xy="204,1391" size="672,166" advanced="true">
       <relation target="" sidePair="center-center,middle-middle"/>
     </group>
-    <component id="n9_tu96" name="item" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" xy="540,1712" visible="false">
+    <component id="n9_tu96" name="item" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" xy="540,1712" visible="false" pkg="drx9d1us">
       <relation target="n6_tu96" sidePair="top-bottom"/>
     </component>
   </displayList>

FGUIProject/assets/CommonGame/components/Component2.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="250,256">
-  <displayList>
-    <image id="n1_ga16" name="n1" src="9cth8z" fileName="imagesExport/cj_hd_kdi.png" xy="0,6"/>
-    <text id="n2_ga16" name="txtName" xy="95,203" size="60,39" fontSize="28" color="#efe4af" align="center" text="物品">
-      <relation target="n1_ga16" sidePair="center-center"/>
-    </text>
-    <loader id="n3_ga16" name="icon" xy="65,59" size="120,120" align="center" vAlign="middle" fill="scale" shrinkOnly="true"/>
-    <loader id="n4_ga16" name="rarity" xy="192,18" size="42,96" url="ui://eg2y0ldpd4iw52"/>
-    <image id="n5_9cth" name="n5" src="9cth90" fileName="imagesExport/cj_hd_zik.png" xy="1,203"/>
-    <image id="n7_pzq1" name="imgNew" src="pzq19p" fileName="imagesExport/cj_hd_xin.png" xy="19,0" visible="false"/>
-  </displayList>
-</component>

FGUIProject/assets/CommonGame/components/LuckyBoxBonusItem.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="290,293" pivot="0.5,0.5" anchor="true">
-  <displayList>
-    <component id="n1_ga16" name="comIcon" src="dcrotaa" fileName="components/Component2.xml" xy="145,146" pivot="0.5,0.5" anchor="true"/>
-    <graph id="n8_dcro" name="holder" xy="144,146" size="1,1" touchable="false" type="rect"/>
-  </displayList>
-  <transition name="t0">
-    <item time="0" type="Scale" target="n1_ga16" tween="true" startValue="0,0" endValue="1,1" duration="4" ease="Expo.In"/>
-  </transition>
-</component>

FGUIProject/assets/CommonGame/package.xml

@@ -40,7 +40,6 @@
     <component id="tu965l" name="Component1.xml" path="/components/"/>
     <image id="tu965m" name="cj_tzzsbj.jpg" path="/images/" atlas="alone_npot"/>
     <image id="fka73" name="cj_dikuang.png" path="/imagesExport/" exported="true"/>
-    <component id="ga16g" name="LuckyBoxBonusItem.xml" path="/components/" exported="true"/>
     <image id="u67n5n" name="cj_tskuang_2.png" path="/images/"/>
     <image id="hinb5p" name="fzd_anniu_1.png" path="/imagesExport/" exported="true"/>
     <component id="hinb5q" name="Button6.xml" path="/components/" exported="true"/>
@@ -143,7 +142,6 @@
     <image id="qdrt18" name="hd_sxicon_4.png" path="/imagesExport/" exported="true"/>
     <component id="n3xha1" name="ComCostCurrency.xml" path="/components/" exported="true"/>
     <font id="k1kha2" name="SIMKAI.TTF" path="/Font/" exported="true" renderMode="" samplePointSize="16"/>
-    <component id="dcrotaa" name="Component2.xml" path="/components/"/>
     <image id="ohuntac" name="zhuxian_shuoto.png" path="/imagesExport/" exported="true"/>
     <movieclip id="lj7ea8" name="MovieClip1.jta" path="/effect/"/>
     <component id="wet2tae" name="ComRewardItem.xml" path="/components/"/>
@@ -237,6 +235,9 @@
     <component id="v95qtjx" name="ComTopTitle.xml" path="/components/" exported="true"/>
     <image id="v95qtjy" name="xgnc_dik_1.png" path="/images/"/>
     <image id="v95qtjz" name="xgnc_btkuang.png" path="/images/" scale="9grid" scale9grid="99,17,198,34"/>
+    <image id="v95qtk0" name="ejzjm_gbzt.png" path="/imagesExport/" exported="true"/>
+    <image id="v95qtk1" name="luyin.png" path="/imgItemIcon/" exported="true"/>
+    <image id="r9ril" name="grxx_xinxin.png" path="/imagesExport/" exported="true"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/DressUp/DressUpFightUI.xml

@@ -25,10 +25,10 @@
     <text id="n14_vxw5" name="txtScore" xy="78,232" size="124,54" group="n33_j48o" fontSize="28" color="#b08649" align="center" vAlign="middle" autoSize="none" autoClearText="true" text="9999"/>
     <group id="n33_j48o" name="n33" xy="23,230" size="204,57" group="n38_8lqj"/>
     <component id="n29_pjip" name="compNeed" src="pjip31" fileName="components/Component1.xml" xy="0,305" group="n38_8lqj"/>
-    <component id="n31_f4xv" name="comListType1" src="f4xv3q" fileName="comListType.xml" xy="850,0" group="n38_8lqj">
+    <component id="n31_f4xv" name="comListType1" src="f4xv3q" fileName="components/comListType.xml" xy="850,0" group="n38_8lqj">
       <relation target="" sidePair="height-height"/>
     </component>
-    <component id="n32_f4xv" name="comListType2" src="f4xv3q" fileName="comListType.xml" xy="850,0" group="n38_8lqj">
+    <component id="n32_f4xv" name="comListType2" src="f4xv3q" fileName="components/comListType.xml" xy="850,0" group="n38_8lqj">
       <relation target="" sidePair="height-height"/>
     </component>
     <component id="n10_qsvd" name="partsList" src="k6he1v" fileName="components/PartsList.xml" xy="1080,0" group="n38_8lqj">
@@ -65,14 +65,17 @@
     <loader id="n42_m1l9" name="btnGuide" xy="455,875" size="170,170" group="n38_8lqj" aspect="true">
       <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
-    <component id="n8_qsvd" name="btnNext" src="wonoe5" fileName="components/Button14.xml" xy="140,1728" group="n38_8lqj">
+    <component id="n8_qsvd" name="btnNext" src="wonoe5" fileName="components/Button14.xml" xy="140,1728" group="n47_v95q">
       <relation target="" sidePair="bottom-bottom"/>
       <Button title="下一步"/>
     </component>
-    <component id="n13_vxw5" name="btnRecommend" src="wonody" fileName="components/Button13.xml" xy="480,1728" group="n38_8lqj" pkg="eg2y0ldp">
+    <component id="n13_vxw5" name="btnRecommend" src="wonody" fileName="components/Button20.xml" pkg="eg2y0ldp" xy="480,1728" group="n47_v95q">
       <relation target="" sidePair="bottom-bottom"/>
       <Button title="推荐搭配"/>
     </component>
+    <group id="n47_v95q" name="n47" xy="140,1728" size="684,97" group="n38_8lqj" advanced="true" layout="hz" colGap="26" excludeInvisibles="true">
+      <relation target="" sidePair="center-center"/>
+    </group>
     <component id="n39_njn2" name="btnAutoPlay" src="jj0mdk" fileName="componentsDialog/Button2.xml" xy="355,1642" group="n38_8lqj">
       <relation target="" sidePair="left-left,bottom-bottom"/>
     </component>

FGUIProject/assets/DressUp/PhotographUI.xml

@@ -1,16 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920" overflow="hidden" scroll="both">
-  <controller name="c1" pages="0,,1," selected="1"/>
+  <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
     <loader id="n8_g3xa" name="btnBg" xy="0,0" size="1080,1136">
       <relation target="" sidePair="height-height"/>
     </loader>
-    <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,154" size="783,1580">
-      <relation target="" sidePair="width-width,height-height,bottom-bottom"/>
-    </loader>
     <component id="n9_g3xa" name="comSelectBox" src="g3xa4l" fileName="components/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"/>
     <component id="n10_i3ix" name="btnPhotograph" src="g3xa4h" fileName="components/Button8.xml" xy="940,409" group="n16_9ico">

FGUIProject/assets/Guide/GuideUI.xml

@@ -4,9 +4,10 @@
     <component id="n0" name="mask" src="tu96e" fileName="components/Component2.xml" xy="0,0">
       <relation target="" sidePair="width-width,height-height"/>
     </component>
-    <component id="n15_tu96" name="rectFrame" src="tu96f" fileName="components/Component3.xml" xy="404,798" visible="false" touchable="false"/>
-    <component id="n17_tu96" name="compTxt" src="tu96d" fileName="components/Component1.xml" xy="261,1099" touchable="false"/>
-    <image id="n18_a5x3" name="rectFrameTemp" src="tu96c" fileName="images/yd_tykuang_2.png" xy="272,822" visible="false"/>
-    <component id="n19_bd1c" name="comHolder" src="axdii" fileName="components/ComHolder.xml" xy="400,1285" touchable="false"/>
+    <loader id="n20_v95q" name="loaMask" xy="0,0" size="1080,1920">
+      <relation target="" sidePair="width-width,height-height"/>
+    </loader>
+    <component id="n19_bd1c" name="comHolder" src="axdii" fileName="components/ComHolder.xml" xy="540,959" pivot="0.5,0.5" anchor="true" touchable="false"/>
+    <component id="n17_tu96" name="compTxt" src="tu96d" fileName="components/Component1.xml" xy="80,1182" visible="false" touchable="false"/>
   </displayList>
 </component>

FGUIProject/assets/Guide/components/ComHolder.xml

@@ -1,8 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="100,100">
+<component size="210,215">
+  <controller name="c1" pages="0,,1,,2," selected="1"/>
   <displayList>
-    <graph id="n19_bd1c" name="holder" xy="0,0" pivot="0.5,0.5" size="100,100" touchable="false">
+    <graph id="n19_bd1c" name="holder" xy="55,57" pivot="0.5,0.5" size="100,100" touchable="false">
       <relation target="" sidePair="center-center,middle-middle"/>
     </graph>
+    <image id="n20_v95q" name="n20" src="tu96c" fileName="images/yd_tykuang_2.png" xy="-33,-31" group="n24_v95q">
+      <gearXY controller="c1" pages="0,1,2" values="-34,-31|-33,-31|-31,-29"/>
+    </image>
+    <image id="n22_v95q" name="n22" src="v95qk" fileName="images/yd_tykuang_4.png" xy="121,51" group="n24_v95q">
+      <gearDisplay controller="c1" pages="0,1"/>
+      <gearXY controller="c1" pages="0,1" values="-67,51|121,51" default="154,82"/>
+    </image>
+    <image id="n23_v95q" name="n23" src="o139g" fileName="images/yd_tykuang_3.png" xy="-69,125" pivot="0.5,0.5" group="n24_v95q" scale="-1,1">
+      <gearDisplay controller="c1" pages="0"/>
+    </image>
+    <image id="n21_v95q" name="n21" src="o139g" fileName="images/yd_tykuang_3.png" xy="179,125" pivot="0.5,0.5" group="n24_v95q">
+      <gearDisplay controller="c1" pages="1"/>
+    </image>
+    <group id="n24_v95q" name="n24" xy="-69,-31" size="353,273" advanced="true"/>
   </displayList>
+  <transition name="t0" autoPlay="true" autoPlayRepeat="-1">
+    <item time="0" type="Scale" target="n21_v95q" tween="true" startValue="1,1" endValue="1.3,1.3" duration="18" ease="Linear"/>
+    <item time="0" type="Scale" target="n23_v95q" tween="true" startValue="-1,1" endValue="-1.3,1.3" duration="18" ease="Linear"/>
+    <item time="18" type="Scale" target="n21_v95q" tween="true" startValue="1.3,1.3" endValue="1,1" duration="18" ease="Linear"/>
+    <item time="18" type="Scale" target="n23_v95q" tween="true" startValue="-1.3,1.3" endValue="-1,1" duration="18" ease="Linear"/>
+  </transition>
 </component>

FGUIProject/assets/Guide/components/Component1.xml

@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="558,160" restrictSize="0,0,200,0">
+<component size="920,181" restrictSize="0,0,200,0">
   <displayList>
-    <image id="n17_tu96" name="txtBg" src="tu96b" fileName="images/yd_tykuang_1.png" xy="-14,0" size="587,160"/>
-    <text id="n18_tu96" name="txt" xy="20,16" pivot="0.5,0" size="517,128" fontSize="32" color="#9b7853" autoSize="none" autoClearText="true" text="，集齐了第一套套装，快去换装界面穿上试试吧！快去换装界面快去换装界面快去换装界面"/>
+    <image id="n17_tu96" name="txtBg" src="tu96b" fileName="images/yd_tykuang_1.png" xy="155,0" size="791,182"/>
+    <text id="n18_tu96" name="txt" xy="248,35" pivot="0.5,0" size="583,96" fontSize="36" color="#9f7e52" autoSize="height" autoClearText="true" text="收拾行囊出发游历，可获得随机地点 的明信片，并有概率获得特殊奖励。"/>
+    <image id="n19_v95q" name="n19" src="v95qj" fileName="images/yd_tyafu.png" xy="0,-77">
+      <relation target="n17_tu96" sidePair="bottom-bottom"/>
+    </image>
   </displayList>
+  <relation target="n17_tu96" sidePair="height-height"/>
 </component>

FGUIProject/assets/Guide/components/Component2.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920" mask="n11" reversedMask="true">
   <displayList>
-    <graph id="n0" name="n0" xy="0,0" size="1080,1920" type="rect" lineSize="0" fillColor="#00000000">
-      <relation target="" sidePair="height-height,width-width"/>
+    <graph id="n13_v95q" name="n13" xy="0,0" size="1080,1920" alpha="0.6" type="rect" lineSize="0" fillColor="#ff000000">
+      <relation target="" sidePair="width-width,height-height"/>
     </graph>
-    <graph id="n11" name="guideArea" xy="419,813" size="268,200" touchable="false" type="rect" lineSize="0"/>
+    <graph id="n11" name="guideArea" xy="540,960" pivot="0.5,0.5" anchor="true" size="210,210" aspect="true" touchable="false" type="eclipse" lineSize="0"/>
   </displayList>
 </component>

FGUIProject/assets/Guide/package.xml

@@ -5,13 +5,15 @@
     <image id="ga167" name="yd_tsbq.png" path="/images/"/>
     <component id="ga169" name="ArrowRight.xml" path="/animations/"/>
     <component id="ga16a" name="ArrowLeft.xml" path="/animations/"/>
-    <image id="tu96b" name="yd_tykuang_1.png" path="/images/" scale="9grid" scale9grid="7,32,213,61"/>
+    <image id="tu96b" name="yd_tykuang_1.png" path="/images/" scale="9grid" scale9grid="34,32,186,61"/>
     <image id="tu96c" name="yd_tykuang_2.png" path="/images/" scale="9grid" scale9grid="25,25,50,50"/>
     <component id="tu96d" name="Component1.xml" path="/components/"/>
     <component id="tu96e" name="Component2.xml" path="/components/"/>
     <component id="tu96f" name="Component3.xml" path="/components/"/>
     <image id="o139g" name="yd_tykuang_3.png" path="/images/"/>
     <component id="axdii" name="ComHolder.xml" path="/components/"/>
+    <image id="v95qj" name="yd_tyafu.png" path="/images/"/>
+    <image id="v95qk" name="yd_tykuang_4.png" path="/images/"/>
   </resources>
   <publish name="Guide" path="..\GameClient\Assets\ResIn\UI\Guide" packageCount="2" genCode="true" extractAlpha="true">
     <atlas name="默认" index="0"/>

FGUIProject/assets/LuckyBox/LuckBoxBonusUI.xml

@@ -4,17 +4,17 @@
     <loader id="n17_gbqo" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
-    <component id="n1_ga16" name="item0" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" pkg="eg2y0ldp" xy="360,452" group="n15_ga16"/>
-    <component id="n5_ga16" name="item1" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" pkg="eg2y0ldp" xy="718,452" group="n15_ga16"/>
-    <component id="n6_ga16" name="item2" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" pkg="eg2y0ldp" xy="182,790" group="n15_ga16"/>
-    <component id="n7_ga16" name="item3" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" pkg="eg2y0ldp" xy="540,790" group="n15_ga16"/>
-    <component id="n8_ga16" name="item4" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" pkg="eg2y0ldp" xy="898,790" group="n15_ga16"/>
-    <component id="n9_ga16" name="item5" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" pkg="eg2y0ldp" xy="182,1128" group="n15_ga16"/>
-    <component id="n10_ga16" name="item6" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" pkg="eg2y0ldp" xy="540,1128" group="n15_ga16"/>
-    <component id="n11_ga16" name="item7" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" pkg="eg2y0ldp" xy="898,1128" group="n15_ga16"/>
-    <component id="n12_ga16" name="item8" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" pkg="eg2y0ldp" xy="360,1466" group="n15_ga16"/>
-    <component id="n13_ga16" name="item9" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" pkg="eg2y0ldp" xy="718,1466" group="n15_ga16"/>
-    <component id="n14_ga16" name="itemOne" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" pkg="eg2y0ldp" xy="540,978" group="n15_ga16"/>
+    <component id="n1_ga16" name="item0" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" xy="360,452" group="n15_ga16"/>
+    <component id="n5_ga16" name="item1" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" xy="718,452" group="n15_ga16"/>
+    <component id="n6_ga16" name="item2" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" xy="182,790" group="n15_ga16"/>
+    <component id="n7_ga16" name="item3" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" xy="540,790" group="n15_ga16"/>
+    <component id="n8_ga16" name="item4" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" xy="898,790" group="n15_ga16"/>
+    <component id="n9_ga16" name="item5" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" xy="182,1128" group="n15_ga16"/>
+    <component id="n10_ga16" name="item6" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" xy="540,1128" group="n15_ga16"/>
+    <component id="n11_ga16" name="item7" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" xy="898,1128" group="n15_ga16"/>
+    <component id="n12_ga16" name="item8" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" xy="360,1466" group="n15_ga16"/>
+    <component id="n13_ga16" name="item9" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" xy="718,1466" group="n15_ga16"/>
+    <component id="n14_ga16" name="itemOne" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" xy="540,978" group="n15_ga16"/>
     <group id="n15_ga16" name="n15" xy="37,306" size="1006,1307" advanced="true">
       <relation target="" sidePair="center-center,middle-middle"/>
     </group>

FGUIProject/assets/LuckyBox/components/Component2.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="385,385">
+  <controller name="c1" pages="0,,1,,2,,3,,4," selected="4"/>
+  <displayList>
+    <image id="n10_v95q" name="n10" src="v95q2u" fileName="images/cj_hd_hdh_1.png" xy="58,60" group="n9_v95q">
+      <gearDisplay controller="c1" pages="4"/>
+    </image>
+    <image id="n11_v95q" name="n11" src="v95q2v" fileName="images/cj_hd_hdh_2.png" xy="58,60" group="n9_v95q">
+      <gearDisplay controller="c1" pages="2"/>
+    </image>
+    <image id="n12_v95q" name="n12" src="v95q2w" fileName="images/cj_hd_hdh_3.png" xy="58,60" group="n9_v95q">
+      <gearDisplay controller="c1" pages="3"/>
+    </image>
+    <image id="n13_v95q" name="n13" src="v95q2x" fileName="images/cj_hd_hdh_4.png" xy="58,60" group="n9_v95q">
+      <gearDisplay controller="c1" pages="1"/>
+    </image>
+    <image id="n14_v95q" name="n14" src="v95q33" fileName="images/cj_hd_zik_1.png" xy="100,270" group="n9_v95q">
+      <gearDisplay controller="c1" pages="4"/>
+    </image>
+    <image id="n15_v95q" name="n15" src="v95q34" fileName="images/cj_hd_zik_2.png" xy="100,270" group="n9_v95q">
+      <gearDisplay controller="c1" pages="3"/>
+    </image>
+    <image id="n16_v95q" name="n16" src="v95q35" fileName="images/cj_hd_zik_3.png" xy="100,270" group="n9_v95q">
+      <gearDisplay controller="c1" pages="2"/>
+    </image>
+    <image id="n17_v95q" name="n17" src="v95q36" fileName="images/cj_hd_zik_4.png" xy="100,270" group="n9_v95q">
+      <gearDisplay controller="c1" pages="1"/>
+    </image>
+    <image id="n7_pzq1" name="imgNew" src="r9ril" fileName="imagesExport/grxx_xinxin.png" pkg="eg2y0ldp" xy="71,88" group="n9_v95q" visible="false"/>
+    <loader id="n3_ga16" name="icon" xy="115,120" size="158,158" group="n9_v95q" aspect="true" align="center" vAlign="middle" fill="scale" shrinkOnly="true"/>
+    <loader id="n4_ga16" name="rarity" xy="278,62" size="42,96" group="n9_v95q" url="ui://eg2y0ldpd4iw52"/>
+    <text id="n2_ga16" name="txtName" xy="163,267" size="60,39" group="n9_v95q" fontSize="28" color="#bf9e73" align="center" text="物品">
+      <gearColor controller="c1" pages="1,2,3,4" values="#b0967d,#000000|#939b89,#000000|#89a2b0,#000000|#bf9e73,#000000" default="#efe4af,#000000"/>
+    </text>
+    <group id="n9_v95q" name="n9" xy="58,60" size="270,270"/>
+  </displayList>
+</component>

FGUIProject/assets/LuckyBox/components/LuckyBoxBonusItem.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="385,385" pivot="0.5,0.5" anchor="true">
+  <controller name="c1" pages="0,,1,,2,,3,,4," selected="4"/>
+  <displayList>
+    <image id="n13_v95q" name="n13" src="v95q2t" fileName="images/cj_glglgl.png" xy="0,0"/>
+    <image id="n9_v95q" name="n9" src="v95q2y" fileName="images/cj_hd_kdi_1.png" xy="58,60">
+      <gearDisplay controller="c1" pages="4"/>
+    </image>
+    <image id="n10_v95q" name="n10" src="v95q2z" fileName="images/cj_hd_kdi_2.png" xy="58,60">
+      <gearDisplay controller="c1" pages="3"/>
+    </image>
+    <image id="n11_v95q" name="n11" src="v95q30" fileName="images/cj_hd_kdi_3.png" xy="58,60">
+      <gearDisplay controller="c1" pages="2"/>
+    </image>
+    <image id="n12_v95q" name="n12" src="v95q31" fileName="images/cj_hd_kdi_4.png" xy="58,60">
+      <gearDisplay controller="c1" pages="1"/>
+    </image>
+    <component id="n1_ga16" name="comIcon" src="dcrotaa" fileName="components/Component2.xml" xy="192,192" pivot="0.5,0.5" anchor="true"/>
+    <graph id="n8_dcro" name="holder" xy="144,146" size="1,1" visible="false" touchable="false" type="rect"/>
+  </displayList>
+  <transition name="t0"/>
+</component>

FGUIProject/assets/LuckyBox/package.xml

@@ -3,8 +3,6 @@
   <resources>
     <image id="fka70" name="cj_anniu_1.png" path="/images/"/>
     <image id="fka71" name="cj_anniu_2.png" path="/images/"/>
-    <image id="fka72" name="cj_anniu_wp.png" path="/images/"/>
-    <image id="fka74" name="cj_dikuanghw.png" path="/images/"/>
     <image id="fka75" name="cj_dikuangtw.png" path="/images/" scale="9grid" scale9grid="56,8,112,16"/>
     <image id="fka76" name="cj_jlbj.jpg" path="/images/" atlas="alone_npot"/>
     <image id="fka78" name="cj_yydik.png" path="/images/"/>
@@ -17,8 +15,6 @@
     <component id="ga16j" name="Component1.xml" path="/components/"/>
     <component id="ga16k" name="CompLuckyBoxBonusListItem.xml" path="/components/"/>
     <component id="l5nzm" name="LuckyBoxStarUI.xml" path="/" exported="true"/>
-    <image id="l5nzn" name="cj_xk_xx.png" path="/images/"/>
-    <image id="l5nzo" name="cj_xk_yd.png" path="/images/"/>
     <image id="l5nzp" name="cj_xk_xian.png" path="/images/" scale="9grid" scale9grid="8,0,9,12"/>
     <component id="l5nzq" name="ComStar.xml" path="/components/"/>
     <image id="vek8s" name="cj_ditua.png" path="/images/"/>
@@ -27,9 +23,6 @@
     <component id="vek811" name="ComListBgItem.xml" path="/components/"/>
     <component id="vek812" name="ComCost.xml" path="/components/"/>
     <image id="qdrt14" name="hd_dkdk_1.png" path="/images/"/>
-    <image id="qdrt16" name="hd_sxicon_2.png" path="/images/" exported="true"/>
-    <image id="qdrt17" name="hd_sxicon_3.png" path="/images/" exported="true"/>
-    <image id="qdrt18" name="hd_sxicon_4.png" path="/images/" exported="true"/>
     <component id="qdrt19" name="LuckyBoxCardUI.xml" path="/" exported="true"/>
     <component id="qdrt1a" name="ComCard.xml" path="/components/"/>
     <image id="qdrt1b" name="hd_tiaoguo.png" path="/images/"/>
@@ -47,7 +40,22 @@
     <component id="njmn2p" name="ComBox_1.xml" path="/combox/" exported="true"/>
     <component id="wono2q" name="LuckyBoxUI.xml" path="/" exported="true"/>
     <image id="v95q2r" name="hd_kkbt_1.png" path="/images/"/>
-    <image id="v95q2s" name="hd_sxicon_1.png" path="/images/"/>
+    <image id="v95q2t" name="cj_glglgl.png" path="/images/"/>
+    <image id="v95q2u" name="cj_hd_hdh_1.png" path="/images/"/>
+    <image id="v95q2v" name="cj_hd_hdh_2.png" path="/images/"/>
+    <image id="v95q2w" name="cj_hd_hdh_3.png" path="/images/"/>
+    <image id="v95q2x" name="cj_hd_hdh_4.png" path="/images/"/>
+    <image id="v95q2y" name="cj_hd_kdi_1.png" path="/images/"/>
+    <image id="v95q2z" name="cj_hd_kdi_2.png" path="/images/"/>
+    <image id="v95q30" name="cj_hd_kdi_3.png" path="/images/"/>
+    <image id="v95q31" name="cj_hd_kdi_4.png" path="/images/"/>
+    <image id="v95q32" name="cj_hd_xin.png" path="/images/"/>
+    <image id="v95q33" name="cj_hd_zik_1.png" path="/images/"/>
+    <image id="v95q34" name="cj_hd_zik_2.png" path="/images/"/>
+    <image id="v95q35" name="cj_hd_zik_3.png" path="/images/"/>
+    <image id="v95q36" name="cj_hd_zik_4.png" path="/images/"/>
+    <component id="dcrotaa" name="Component2.xml" path="/components/"/>
+    <component id="ga16g" name="LuckyBoxBonusItem.xml" path="/components/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\LuckyBox" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Main/MainUI.xml

@@ -1,83 +1,108 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920" designImage="ui://mfvz4q8kv482fw" designImageOffsetX="1080" designImageOffsetY="-240">
   <displayList>
-    <component id="n21_q08x" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95"/>
-    <list id="n41_wg7t" name="list" xy="916,308" size="97,158" group="n57_oju1" overflow="hidden" scroll="horizontal" margin="20,0,0,0" lineGap="20" colGap="14" vAlign="middle" foldInvisibleItems="true">
-      <relation target="" sidePair="right-right,top-top"/>
-      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08x9" name="btnGongGao"/>
-      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xa" name="btnHaoYou"/>
-      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xj" name="btnYouJian"/>
-      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xe" name="btnRenWu"/>
-      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xd" name="btnPengYouQuan"/>
-      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xb" name="btnJInShu"/>
-      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xg" name="btnTuJian"/>
-      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xf" name="btnTianGong"/>
-      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kndrd7k" name="btnStore"/>
-      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kwg7t8x" name="btnBag"/>
-    </list>
-    <component id="n43_wg7t" name="btnChange" src="wg7t8z" fileName="components/ButtonChange.xml" xy="964,466" pivot="0.5,0" anchor="true" group="n57_oju1">
-      <relation target="n41_wg7t" sidePair="center-center,bottom-bottom"/>
-    </component>
-    <group id="n57_oju1" name="grpList" xy="913,308" size="102,271" advanced="true"/>
+    <image id="n68_v95q" name="n68" src="v95qi0" fileName="images/zjm_mbmbmb.png" xy="0,1002" group="n52_qqat"/>
     <component id="n61_r9ri" name="headBar" src="slb416" fileName="components/ComponentHeadBar.xml" xy="34,160" group="n52_qqat"/>
     <component id="n46_lh8v" name="btnDailyLogin" src="ox5bf5" fileName="components/Button2.xml" xy="24,305" group="n52_qqat" visible="false">
       <relation target="" sidePair="left-left,top-top"/>
     </component>
-    <component id="n4_q08x" name="btnMain" src="q08xu" fileName="components/ButtonModle1.xml" xy="720,1587" size="360,274" group="n52_qqat">
+    <component id="n4_q08x" name="btnMain" src="q08xu" fileName="components/ButtonModle1.xml" xy="720,1587" size="310,274" group="n52_qqat">
       <relation target="" sidePair="bottom-bottom"/>
       <Button icon="ui://mfvz4q8kv482fm"/>
+      <property target="loaLockIcon" propertyId="1" value="ui://mfvz4q8kv95qhs"/>
     </component>
     <component id="n5_q08x" name="btnHuanZhuang" src="q08xu" fileName="components/ButtonModle1.xml" xy="25,1644" group="n52_qqat">
       <relation target="" sidePair="bottom-bottom"/>
       <Button icon="ui://mfvz4q8kv482fn"/>
+      <property target="loaLockIcon" propertyId="1" value="ui://mfvz4q8kv95qht"/>
     </component>
     <component id="n7_q08x" name="btnXiuFang" src="q08xu" fileName="components/ButtonModle1.xml" xy="208,1644" group="n52_qqat">
       <relation target="" sidePair="bottom-bottom"/>
       <Button icon="ui://mfvz4q8kv482fo"/>
+      <property target="loaLockIcon" propertyId="1" value="ui://mfvz4q8kv95qhu"/>
     </component>
     <component id="n8_q08x" name="btnCiPai" src="q08xu" fileName="components/ButtonModle1.xml" xy="391,1644" group="n52_qqat">
       <relation target="" sidePair="bottom-bottom"/>
       <Button icon="ui://mfvz4q8kv482fp"/>
+      <property target="loaLockIcon" propertyId="1" value="ui://mfvz4q8kv95qhv"/>
     </component>
     <component id="n6_q08x" name="btnZhaiXing" src="q08xu" fileName="components/ButtonModle1.xml" xy="574,1644" group="n52_qqat">
       <relation target="" sidePair="bottom-bottom"/>
       <Button icon="ui://mfvz4q8kv482fq"/>
+      <property target="loaLockIcon" propertyId="1" value="ui://mfvz4q8kv95qhw"/>
     </component>
-    <group id="n52_qqat" name="grpLeft" xy="24,160" size="1056,1700" group="n59_oju1" advanced="true"/>
-    <component id="n44_n3xh" name="btnStudio" src="q08xu" fileName="components/ButtonModle1.xml" xy="1838,640" size="77,255" group="n58_oju1">
+    <group id="n52_qqat" name="grpLeft" xy="0,160" size="1080,1760" group="n59_oju1" advanced="true"/>
+    <component id="n44_n3xh" name="btnStudio" src="q08xu" fileName="components/ButtonModle1.xml" xy="1838,621" size="87,293" group="n58_oju1">
       <relation target="" sidePair="middle-middle"/>
       <Button icon="ui://mfvz4q8kv482ft"/>
+      <property target="loaLockIcon" propertyId="1" value="ui://mfvz4q8kv95qhz"/>
     </component>
-    <component id="n45_kqhd" name="btnField" src="q08xu" fileName="components/ButtonModle1.xml" xy="1998,1571" size="77,256" group="n58_oju1">
+    <component id="n45_kqhd" name="btnField" src="q08xu" fileName="components/ButtonModle1.xml" xy="1998,1552" size="87,294" group="n58_oju1">
       <relation target="" sidePair="middle-middle"/>
       <Button icon="ui://mfvz4q8kv482fv"/>
+      <property target="loaLockIcon" propertyId="1" value="ui://mfvz4q8kv95qhz"/>
     </component>
-    <component id="n51_v482" name="btnPoem" src="q08xu" fileName="components/ButtonModle1.xml" xy="1576,1450" size="77,256" group="n58_oju1">
+    <component id="n51_v482" name="btnPoem" src="q08xu" fileName="components/ButtonModle1.xml" xy="1576,1431" size="87,294" group="n58_oju1">
       <relation target="" sidePair="middle-middle"/>
       <Button icon="ui://mfvz4q8kv482fr"/>
+      <property target="loaLockIcon" propertyId="1" value="ui://mfvz4q8kv95qhz"/>
     </component>
-    <component id="n60_wono" name="btnTravel" src="q08xu" fileName="components/ButtonModle1.xml" xy="2005,859" size="77,255" group="n58_oju1">
+    <component id="n60_wono" name="btnTravel" src="q08xu" fileName="components/ButtonModle1.xml" xy="2005,840" size="87,293" group="n58_oju1">
       <relation target="" sidePair="middle-middle"/>
       <Button icon="ui://mfvz4q8kwonohg"/>
+      <property target="loaLockIcon" propertyId="1" value="ui://mfvz4q8kv95qhz"/>
     </component>
-    <group id="n58_oju1" name="grpRight" xy="1576,640" size="506,1187" group="n59_oju1" advanced="true"/>
-    <group id="n59_oju1" name="grpMove" xy="24,160" size="2058,1700" advanced="true"/>
+    <group id="n58_oju1" name="grpRight" xy="1576,621" size="516,1225" group="n59_oju1" advanced="true"/>
+    <image id="n62_v95q" name="n62" src="v95qhy" fileName="images/zjm_gsmh.png" xy="956,-240" group="n64_v95q"/>
+    <image id="n63_v95q" name="n63" src="v95qhx" fileName="images/zjm_qhqh.png" xy="1037,960" pivot="0.5,0.5" anchor="true" group="n64_v95q"/>
+    <image id="n65_v95q" name="n65" src="v95qhx" fileName="images/zjm_qhqh.png" xy="1140,960" pivot="0.5,0.5" anchor="true" group="n64_v95q" scale="-1,1"/>
+    <group id="n64_v95q" name="n64" xy="937,-240" size="303,2400" group="n59_oju1" advanced="true">
+      <relation target="" sidePair="middle-middle"/>
+    </group>
+    <group id="n59_oju1" name="grpMove" xy="0,-240" size="2092,2400" advanced="true"/>
+    <component id="n21_q08x" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95"/>
+    <list id="n41_wg7t" name="list" xy="916,308" size="97,158" group="n57_oju1" overflow="hidden" scroll="horizontal" margin="20,0,0,0" lineGap="20" colGap="14" vAlign="middle" foldInvisibleItems="true">
+      <relation target="" sidePair="right-right,top-top"/>
+      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08x9" name="btnGongGao"/>
+      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xa" name="btnHaoYou"/>
+      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xj" name="btnYouJian"/>
+      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xe" name="btnRenWu"/>
+      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xd" name="btnPengYouQuan"/>
+      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xb" name="btnJInShu"/>
+      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xg" name="btnTuJian"/>
+      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xf" name="btnTianGong"/>
+      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kndrd7k" name="btnStore"/>
+      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kwg7t8x" name="btnBag"/>
+    </list>
+    <component id="n43_wg7t" name="btnChange" src="wg7t8z" fileName="components/ButtonChange.xml" xy="964,466" pivot="0.5,0" anchor="true" group="n57_oju1">
+      <relation target="n41_wg7t" sidePair="center-center,bottom-bottom"/>
+    </component>
+    <group id="n57_oju1" name="grpList" xy="913,308" size="102,271" advanced="true"/>
+    <loader id="n66_v95q" name="loaGuidestudio" xy="0,0" size="1080,1920" visible="false"/>
   </displayList>
   <transition name="t1">
     <item time="0" type="Alpha" target="n57_oju1" tween="true" startValue="1" endValue="0" duration="6" ease="Linear"/>
     <item time="0" type="Alpha" target="n58_oju1" value="0"/>
-    <item time="0" type="XY" target="n59_oju1" tween="true" startValue="0,160" endValue="-1080,160" duration="24" ease="Circ.InOut"/>
+    <item time="0" type="Visible" target="n63_v95q" value="true"/>
+    <item time="0" type="Visible" target="n65_v95q" value="false"/>
+    <item time="0" type="XY" target="n59_oju1" tween="true" startValue="0,-240" endValue="-1080,-240" duration="24" ease="Circ.InOut"/>
     <item time="6" type="Alpha" target="n52_qqat" tween="true" startValue="1" endValue="0" duration="6" ease="Linear"/>
     <item time="6" type="Visible" target="n57_oju1" value="false"/>
+    <item time="12" type="Visible" target="n63_v95q" value="false"/>
     <item time="15" type="Alpha" target="n58_oju1" tween="true" startValue="0" endValue="1" duration="7" ease="Linear"/>
+    <item time="24" type="Visible" target="n65_v95q" value="true"/>
   </transition>
   <transition name="t2">
     <item time="0" type="Alpha" target="n52_qqat" value="0"/>
     <item time="0" type="Alpha" target="n57_oju1" value="0"/>
-    <item time="0" type="XY" target="n59_oju1" tween="true" startValue="-1080,160" endValue="0,160" duration="24" ease="Circ.InOut"/>
+    <item time="0" type="Visible" target="n63_v95q" value="false"/>
+    <item time="0" type="Visible" target="n65_v95q" value="true"/>
+    <item time="0" type="XY" target="n59_oju1" tween="true" startValue="-1080,-240" endValue="0,-240" duration="24" ease="Circ.InOut"/>
     <item time="6" type="Alpha" target="n58_oju1" tween="true" startValue="1" endValue="0" duration="6" ease="Linear"/>
     <item time="12" type="Alpha" target="n52_qqat" tween="true" startValue="0" endValue="1" duration="6" ease="Linear"/>
+    <item time="12" type="Visible" target="n65_v95q" value="false"/>
     <item time="18" type="Alpha" target="n57_oju1" tween="true" startValue="0" endValue="1" duration="5" ease="Linear"/>
     <item time="18" type="Visible" target="n57_oju1" value="true"/>
+    <item time="24" type="Visible" target="n63_v95q" value="true"/>
   </transition>
 </component>

FGUIProject/assets/Main/StoryFightSingleScoreUI.xml

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

FGUIProject/assets/Main/StoryFightTargetScoreUI.xml

@@ -7,13 +7,13 @@
     <component id="n37_mhyh" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="34,80">
       <Button icon="ui://eg2y0ldpuyuxtj4"/>
     </component>
-    <component id="n28_uj53" name="proScore" src="v3k9c7" fileName="components/ProgressBarTargetScore.xml" xy="170,108" pivot="0,0.5" anchor="true">
+    <component id="n28_uj53" name="proScore" src="v3k9c7" fileName="components/ProgressBarTargetScore.xml" xy="160,127" pivot="0,0.5" anchor="true">
       <ProgressBar max="100"/>
     </component>
-    <component id="n17_mza1" name="comMineCircle" src="c2umeg" fileName="components/comMineCircle.xml" xy="380,1428" pivot="0.5,0.5" anchor="true" visible="false">
+    <component id="n17_mza1" name="comMineCircle" src="c2umeg" fileName="components/comMineCircle.xml" xy="252,1300" pivot="0.5,0.5" visible="false">
       <relation target="" sidePair="bottom-bottom"/>
     </component>
-    <component id="n15_mza1" name="comTargetCircle" src="v3k9c4" fileName="components/comTargetCircle.xml" xy="700,1428" pivot="0.5,0.5" anchor="true" visible="false">
+    <component id="n15_mza1" name="comTargetCircle" src="v3k9c4" fileName="components/comTargetCircle.xml" xy="572,1300" pivot="0.5,0.5" visible="false">
       <relation target="" sidePair="bottom-bottom"/>
     </component>
     <component id="n24_vbe8" name="proMinusMine" src="mhyhd4" fileName="components/ProgressBar2.xml" xy="190,700">

FGUIProject/assets/Main/components/ButtonModle1.xml

@@ -2,7 +2,7 @@
 <component size="158,214" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <loader id="n1_wg7t" name="icon" xy="79,107" pivot="0.5,0.5" anchor="true" size="158,214" url="ui://mfvz4q8kv482fo" autoSize="true">
+    <loader id="n1_wg7t" name="icon" xy="79,107" pivot="0.5,0.5" anchor="true" size="148,176" url="ui://mfvz4q8kv482fo" autoSize="true">
       <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
     <graph id="n2_lki4" name="holder" xy="127,130" size="0,0" touchable="false">
@@ -11,6 +11,11 @@
     <graph id="n4_lki4" name="holder1" xy="127,130" size="0,0" visible="false" touchable="false">
       <relation target="" sidePair="height-height"/>
     </graph>
+    <loader id="n8_v95q" name="loaLockIcon" xy="79,107" pivot="0.5,0.5" anchor="true" size="84,395" url="ui://eg2y0ldpv95qtk0" autoSize="true">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </loader>
   </displayList>
   <Button/>
+  <relation target="n1_wg7t" sidePair="width-width,height-height"/>
+  <customProperty target="loaLockIcon" propertyId="1"/>
 </component>

FGUIProject/assets/Main/components/ComRole.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="585,1317" overflow="hidden" mask="n14_wono">
+<component size="585,1317" overflow="hidden" opaque="false" mask="n14_wono">
   <displayList>
     <image id="n14_wono" name="n14" src="wonogw" fileName="imagesFight/jz_yjd_dd.png" xy="1,0"/>
     <loader id="n16_wono" name="loaBg" xy="1,0" size="583,1317" url="ui://mfvz4q8kwonogw" fill="scaleMatchWidth" autoSize="true">

FGUIProject/assets/Main/components/ComRoleResult0.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="721,243" overflow="hidden">
+<component size="721,243" overflow="hidden" opaque="false">
   <displayList>
     <image id="n16_wono" name="n16" src="wonoh5" fileName="imagesFight/jz_shan_1.png" xy="0,0" size="721,243" fillMethod="vt" fillOrigin="1">
       <relation target="" sidePair="bottom-bottom"/>

FGUIProject/assets/Main/components/ComRoleResult1.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="491,334" overflow="hidden">
+<component size="491,334" overflow="hidden" opaque="false">
   <displayList>
     <image id="n17_wono" name="n17" src="wonoh6" fileName="imagesFight/jz_shan_2.png" xy="0,0">
       <relation target="" sidePair="bottom-bottom"/>

FGUIProject/assets/Main/components/ComRoleResult2.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="158,333" overflow="hidden">
+<component size="158,333" overflow="hidden" opaque="false">
   <displayList>
     <image id="n18_wono" name="n18" src="wonoh7" fileName="imagesFight/jz_shan_3.png" xy="0,0">
       <relation target="" sidePair="bottom-bottom"/>

FGUIProject/assets/Main/components/ComRoleResult3.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="273,244" overflow="hidden">
+<component size="273,244" overflow="hidden" opaque="false">
   <displayList>
     <image id="n19_wono" name="n19" src="wonoh8" fileName="imagesFight/jz_yzi_1.png" xy="0,0">
       <relation target="" sidePair="bottom-bottom"/>

FGUIProject/assets/Main/components/ComRoleResult4.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="163,360" overflow="hidden">
+<component size="163,360" overflow="hidden" opaque="false">
   <displayList>
     <image id="n20_wono" name="n20" src="wonoh9" fileName="imagesFight/jz_yzi_2.png" xy="0,0">
       <relation target="" sidePair="bottom-bottom"/>

FGUIProject/assets/Main/components/ComScoreStage.xml

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

FGUIProject/assets/Main/components/Component2.xml

@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="775,24">
+<component size="835,31">
   <displayList>
-    <component id="n1_uj53" name="bar" src="k1khe8" fileName="components/Component3.xml" xy="0,0">
+    <component id="n1_uj53" name="bar" src="k1khe8" fileName="components/Component3.xml" xy="0,0" size="837,31">
       <relation target="" sidePair="width-width"/>
     </component>
-    <image id="n6_uj53" name="imgAni" src="wonogq" fileName="imagesStory/zd_jsjm_jdt_3.png" xy="773,15" pivot="0.65,0.6" anchor="true">
-      <relation target="" sidePair="right-right"/>
-    </image>
-    <graph id="n7_k1kh" name="holder" xy="774,11" pivot="0.5,0.5" size="1,1">
+    <graph id="n7_k1kh" name="holder" xy="834,11" pivot="0.5,0.5" size="1,1">
       <relation target="" sidePair="right-right"/>
     </graph>
     <graph id="n8_ecw3" name="holder1" xy="417,11" pivot="0.5,0.5" size="1,1"/>

FGUIProject/assets/Main/components/Component3.xml

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

FGUIProject/assets/Main/components/ProgressBar1.xml

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

FGUIProject/assets/Main/components/ProgressBarTargetScore.xml

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

FGUIProject/assets/Main/package.xml

@@ -391,10 +391,6 @@
     <image id="wonogu" name="zd_bl_0.png" path="/imagesStory/" exported="true"/>
     <image id="wonogw" name="jz_yjd_dd.png" path="/imagesFight/"/>
     <image id="wonogx" name="jz_yjd_f.png" path="/imagesFight/"/>
-    <image id="wonogy" name="zd_jz_4.png" path="/imagesStory/"/>
-    <image id="wonogz" name="zd_jz_1.png" path="/imagesStory/"/>
-    <image id="wonoh0" name="zd_jz_2.png" path="/imagesStory/"/>
-    <image id="wonoh1" name="zd_jz_3.png" path="/imagesStory/"/>
     <component id="wonoh2" name="ComSingleScoreStage.xml" path="/components/"/>
     <image id="wonoh3" name="zd_bl_1.png" path="/imagesStory/" exported="true"/>
     <image id="wonoh5" name="jz_shan_1.png" path="/imagesFight/"/>
@@ -419,6 +415,24 @@
     <component id="v95qhn" name="ListRewardItem.xml" path="/components/"/>
     <image id="v95qho" name="self.png" path="/imagesDialog/"/>
     <image id="v95qhp" name="jinbixie.png" path="/imagesDialog/"/>
+    <image id="v95qhr" name="ejzjm_gbzt.png" path="/components/"/>
+    <image id="v95qhs" name="zjm_an_5.png" path="/images/"/>
+    <image id="v95qht" name="zjm_an_1.png" path="/images/"/>
+    <image id="v95qhu" name="zjm_an_2.png" path="/images/"/>
+    <image id="v95qhv" name="zjm_an_3.png" path="/images/"/>
+    <image id="v95qhw" name="zjm_an_4.png" path="/images/"/>
+    <image id="v95qhx" name="zjm_qhqh.png" path="/images/"/>
+    <image id="v95qhy" name="zjm_gsmh.png" path="/images/" atlas="alone_npot"/>
+    <image id="v95qhz" name="zjm_ej_suo.png" path="/images/"/>
+    <image id="v95qi0" name="zjm_mbmbmb.png" path="/images/"/>
+    <image id="v95qi1" name="zd_zdjdt_4.png" path="/imagesStory/"/>
+    <image id="v95qi2" name="zd_jz_an_3.png" path="/imagesStory/"/>
+    <image id="v95qi6" name="zd_jz_an_1.png" path="/imagesStory/"/>
+    <image id="v95qi7" name="zd_jz_an_2.png" path="/imagesStory/"/>
+    <image id="v95qi8" name="zd_jz_3.png" path="/imagesStory/"/>
+    <image id="v95qi9" name="zd_jz_1.png" path="/imagesStory/"/>
+    <image id="v95qia" name="zd_jz_2.png" path="/imagesStory/"/>
+    <image id="v95qib" name="zd_jdbiao.png" path="/imagesStory/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/RoleInfo/ChangeHead.xml

@@ -1,24 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="996,1180">
-  <controller name="c1" pages="0,,1," selected="1"/>
+  <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
     <image id="n9_r9ri" name="n9" src="r9rii" fileName="images/grxx_ditup.png" xy="0,0"/>
-    <list id="n3_r9ri" name="list" xy="93,464" size="809,462" layout="flow_hz" overflow="scroll" defaultItem="ui://374k3dwvr9ri9" autoClearItems="true">
+    <list id="n3_r9ri" name="list" xy="86,464" size="814,462" layout="flow_hz" overflow="scroll" colGap="4" defaultItem="ui://374k3dwvr9ri9" autoClearItems="true">
       <gearDisplay controller="c1" pages="0"/>
       <item/>
       <item/>
       <item/>
       <item/>
       <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
     </list>
-    <list id="n15_r9ri" name="listBorder" xy="73,464" size="861,462" layout="flow_hz" overflow="scroll" lineGap="-20" colGap="-20" defaultItem="ui://374k3dwvr9ri22" autoClearItems="true">
+    <list id="n15_r9ri" name="listBorder" xy="72,449" size="861,474" layout="flow_hz" overflow="scroll" lineGap="-20" colGap="-20" defaultItem="ui://374k3dwvv95qg3" autoClearItems="true">
       <gearDisplay controller="c1" pages="1"/>
       <item/>
       <item/>
@@ -35,14 +28,14 @@
     </list>
     <image id="n8_r9ri" name="n8" src="r9ri1x" fileName="images/hl_sczpxzdik.png" xy="205,96" size="585,76" group="n10_r9ri"/>
     <component id="n0_r9ri" name="btnTab0" src="r9ri6" fileName="components/Button1.xml" xy="225,93" group="n10_r9ri">
-      <Button icon="ui://374k3dwvr9rip" selectedIcon="ui://374k3dwvr9rin" controller="c1" page="0"/>
+      <Button checked="true" icon="ui://374k3dwvr9rip" selectedIcon="ui://374k3dwvr9rin" controller="c1" page="0"/>
     </component>
     <component id="n1_r9ri" name="btnTab1" src="r9ri6" fileName="components/Button1.xml" xy="520,94" group="n10_r9ri">
-      <Button checked="true" icon="ui://374k3dwvr9riq" selectedIcon="ui://374k3dwvr9rio" controller="c1" page="1"/>
+      <Button icon="ui://374k3dwvr9riq" selectedIcon="ui://374k3dwvr9rio" controller="c1" page="1"/>
     </component>
     <group id="n10_r9ri" name="n10" xy="205,93" size="585,84"/>
     <image id="n11_r9ri" name="n11" src="r9rim" fileName="images/grxx_xtxtx.png" xy="381,330" size="520,6" group="n12_r9ri"/>
-    <component id="n4_r9ri" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" xy="105,187" size="236,238" group="n12_r9ri" scale="1.2,1.2" pkg="eg2y0ldp"/>
+    <component id="n4_r9ri" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="105,187" size="236,238" group="n12_r9ri" scale="1.2,1.2"/>
     <text id="n5_r9ri" name="txtName" xy="394,263" size="129,56" group="n12_r9ri" font="ui://eg2y0ldpwonotja" fontSize="42" color="#ab8759" text="头像名"/>
     <text id="n6_r9ri" name="txtDesc" xy="394,345" size="138,46" group="n12_r9ri" fontSize="34" color="#ceb599" text="头像描述"/>
     <group id="n12_r9ri" name="n12" xy="105,187" size="796,238"/>

FGUIProject/assets/RoleInfo/OtherRoleInfoUI.xml

@@ -5,14 +5,12 @@
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
     <component id="n52_r9ri" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,90"/>
-    <component id="n33_r9ri" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" xy="96,147" group="n53_oqa1" scale="1.3,1.3" pkg="eg2y0ldp"/>
-    <image id="n29_r9ri" name="n29" src="r9ri24" fileName="images/zjm_dj_1.png" xy="295,317" group="n53_oqa1"/>
-    <text id="n30_r9ri" name="txtLvl" xy="304,324" size="34,34" group="n53_oqa1" fontSize="24" color="#ffffff" align="center" text="99">
+    <component id="n33_r9ri" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="96,147" group="n53_oqa1" scale="1.3,1.3"/>
+    <image id="n29_r9ri" name="n29" src="r9ri24" fileName="images/zjm_dj_1.png" xy="286,339" group="n53_oqa1"/>
+    <text id="n30_r9ri" name="txtLvl" xy="295,346" size="34,34" group="n53_oqa1" fontSize="24" color="#ffffff" align="center" text="99">
       <relation target="n29_r9ri" sidePair="center-center,middle-middle"/>
     </text>
-    <image id="n32_r9ri" name="n32" src="r9ri16" fileName="images/grxx_zyshul.png" xy="158,375" group="n53_oqa1"/>
-    <text id="n36_r9ri" name="txtExp" xy="215,373" pivot="0.5,0" size="44,34" group="n53_oqa1" fontSize="24" color="#fbedda" letterSpacing="-2" text="0/1"/>
-    <group id="n53_oqa1" name="n53" xy="96,147" size="249,260" group="n37_r9ri"/>
+    <group id="n53_oqa1" name="n53" xy="96,147" size="240,245" group="n37_r9ri"/>
     <image id="n50_r9ri" name="n50" src="r9rim" fileName="images/grxx_xtxtx.png" xy="417,297" size="576,6" group="n54_oqa1"/>
     <text id="n5_d4iw" name="txtRoleName" xy="428,214" size="328,64" group="n54_oqa1" font="ui://eg2y0ldpwonotja" fontSize="48" color="#927346" align="center" letterSpacing="-2" text="玩家名称七个字"/>
     <text id="n55_v95q" name="txtSlogan" xy="431,318" size="549,89" group="n54_oqa1" fontSize="30" color="#a6967c" autoSize="none" text=""/>

FGUIProject/assets/RoleInfo/PersonalPhotoUI.xml

@@ -5,20 +5,21 @@
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
     <component id="n7_r9ri" name="btnback" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80" controller="c1,1">
-      <relation target="" sidePair="left-left,top-top"/>
       <Button icon="ui://eg2y0ldpuyuxtj4"/>
       <property target="loaTitle" propertyId="1" value="ui://374k3dwvr9ri1w"/>
     </component>
     <image id="n5_r9ri" name="n5" src="r9ri18" fileName="images/grxx_grxcxc.png" xy="327,195"/>
     <list id="n0_r9ri" name="list" xy="22,345" size="1035,1575" layout="flow_hz" overflow="scroll" lineGap="40" colGap="10" defaultItem="ui://374k3dwvr9ri1v" autoClearItems="true">
-      <relation target="" sidePair="bottomext-bottom"/>
+      <relation target="" sidePair="top-top,bottomext-bottom"/>
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
     <image id="n8_r9ri" name="n8" src="r9ri12o" fileName="images/hl_ddandik.png" pkg="eg2y0ldp" xy="391,811" group="n10_r9ri"/>
-    <text id="n9_r9ri" name="n9" xy="387,934" size="305,52" group="n10_r9ri" fontSize="38" color="#ac9b7f" text="暂未添加任何作品"/>
-    <group id="n10_r9ri" name="grpNothing" xy="387,811" size="305,298"/>
+    <text id="n9_r9ri" name="n9" xy="387,934" size="305,51" group="n10_r9ri" fontSize="38" color="#ac9b7f" text="暂未添加任何作品"/>
+    <group id="n10_r9ri" name="grpNothing" xy="387,811" size="305,298" advanced="true">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </group>
   </displayList>
 </component>

FGUIProject/assets/RoleInfo/RoleInfoUI.xml

@@ -10,8 +10,8 @@
     <component id="n18_d4iw" name="btnHelp" src="d4iw6p" fileName="components/ButtonHelp.xml" xy="983,129">
       <Button title="?" titleColor="#000000"/>
     </component>
-    <component id="n52_r9ri" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,90"/>
-    <component id="n33_r9ri" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" xy="96,147" group="n53_oqa1" scale="1.3,1.3" pkg="eg2y0ldp"/>
+    <component id="n52_r9ri" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
+    <component id="n33_r9ri" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="96,147" group="n53_oqa1" scale="1.3,1.3"/>
     <image id="n29_r9ri" name="n29" src="r9ri24" fileName="images/zjm_dj_1.png" xy="295,317" group="n53_oqa1"/>
     <text id="n30_r9ri" name="txtLvl" xy="304,324" size="34,34" group="n53_oqa1" fontSize="24" color="#ffffff" align="center" text="99">
       <relation target="n29_r9ri" sidePair="center-center,middle-middle"/>

FGUIProject/assets/RoleInfo/components/ComPhoto.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="482,432" overflow="hidden">
   <displayList>
-    <loader id="n49_r9ri" name="loaPhoto" xy="0,48" pivot="0.5,0.5" size="482,432" url="ui://374k3dwvr9ri1n" align="center" vAlign="middle" fill="scaleNoBorder"/>
+    <loader id="n49_r9ri" name="loaPhoto" xy="0,4" pivot="0.5,0.5" size="482,593" url="ui://374k3dwvr9ri1n" align="center" vAlign="middle" fill="scaleNoBorder"/>
   </displayList>
 </component>

FGUIProject/assets/RoleInfo/components/ListHeadBorderItem.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="230,230">
+<component size="230,230" extention="Button">
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
-    <graph id="n6_r9ri" name="n6" xy="34,38" pivot="0.5,0.5" size="157,157" group="n10_r9ri" aspect="true" type="eclipse" lineSize="0" fillColor="#ffeed5be"/>
-    <loader id="n4_r9ri" name="loaIcon" xy="34,38" size="155,157" group="n10_r9ri" url="ui://374k3dwvr9ri1z" fill="scale"/>
-    <image id="n5_r9ri" name="n5" src="r9ri1y" fileName="images/grxx_txtxczy.png" xy="33,37" group="n10_r9ri">
+    <loader id="n4_v95q" name="loaIcon" xy="34,38" size="155,157" url="ui://374k3dwvr9ri1z" fill="scale"/>
+    <image id="n5_v95q" name="n5" src="r9ri1y" fileName="images/grxx_txtxczy.png" xy="33,37">
       <gearDisplay controller="button" pages="1"/>
     </image>
-    <loader id="n7_r9ri" name="loaBorder" xy="0,13" pivot="0.5,0.5" size="230,203" group="n10_r9ri" aspect="true" url="ui://374k3dwvr9ri23" autoSize="true"/>
-    <group id="n10_r9ri" name="n10" xy="0,13" size="230,203"/>
+    <loader id="n6_v95q" name="loaBorder" xy="0,13" pivot="0.5,0.5" size="230,203" aspect="true" touchable="false" url="ui://374k3dwvr9ri23" autoSize="true"/>
+    <image id="n7_v95q" name="imgNew" src="r9ril" fileName="images/grxx_xinxin.png" xy="154,45" pkg="eg2y0ldp"/>
   </displayList>
+  <Button mode="Radio"/>
 </component>

FGUIProject/assets/RoleInfo/components/ListHeadItem.xml

@@ -7,7 +7,7 @@
     <image id="n5_r9ri" name="n5" src="r9rik" fileName="images/grxx_txxzlx.png" xy="2,2">
       <gearDisplay controller="button" pages="1"/>
     </image>
-    <image id="n7_r9ri" name="imgNew" src="r9ril" fileName="images/grxx_xinxin.png" xy="140,18"/>
+    <image id="n7_r9ri" name="imgNew" src="r9ril" fileName="images/grxx_xinxin.png" xy="140,18" pkg="eg2y0ldp"/>
   </displayList>
   <Button mode="Radio"/>
 </component>

FGUIProject/assets/RoleInfo/package.xml

@@ -29,7 +29,6 @@
     <image id="r9rii" name="grxx_ditup.png" path="/images/"/>
     <image id="r9rij" name="grxx_txkuang.png" path="/images/"/>
     <image id="r9rik" name="grxx_txxzlx.png" path="/images/"/>
-    <image id="r9ril" name="grxx_xinxin.png" path="/images/"/>
     <image id="r9rim" name="grxx_xtxtx.png" path="/images/" scale="9grid" scale9grid="204,1,408,2"/>
     <image id="r9rin" name="grxx_xztxtx_1.png" path="/images/"/>
     <image id="r9rio" name="grxx_xztxtx_2.png" path="/images/"/>
@@ -73,11 +72,11 @@
     <image id="r9ri1z" name="grxx_txtxya_1.png" path="/images/"/>
     <image id="r9ri20" name="grxx_xtkk_1.png" path="/images/"/>
     <component id="r9ri21" name="Component1.xml" path="/components/"/>
-    <component id="r9ri22" name="ListHeadBorderItem.xml" path="/components/"/>
     <image id="r9ri23" name="grxx_xtkk_2.png" path="/images/"/>
     <image id="r9ri24" name="zjm_dj_1.png" path="/images/"/>
     <image id="oqa1g1" name="xc_qxxzxd.png" path="/images/"/>
     <component id="v95qg2" name="OtherRoleInfoUI.xml" path="/" exported="true"/>
+    <component id="v95qg3" name="ListHeadBorderItem.xml" path="/components/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\RoleInfo" packageCount="2" genCode="true"/>
 </packageDescription>

FGUIProject/assets/XiuFang/components/Component.xml

@@ -2,8 +2,12 @@
 <component size="1000,1246" overflow="scroll" scroll="horizontal">
   <displayList>
     <loader id="n4_9xlo" name="btnClothingShop" xy="0,0" size="320,1246" url="ui://kv0ad4wy9xlo3" autoSize="true"/>
-    <loader id="n5_9xlo" name="btnClothingUpgrade" xy="640,0" size="320,1246" url="ui://kv0ad4wy9xlo4" autoSize="true"/>
     <loader id="n6_9xlo" name="btnSuitSynthetic" xy="320,0" size="320,1246" url="ui://kv0ad4wy9xlo6" autoSize="true"/>
-    <loader id="n8_wlc2" name="btnDecompose" xy="958,0" size="321,1246" url="ui://kv0ad4wyqyr69" autoSize="true"/>
+    <loader id="n5_9xlo" name="btnClothingUpgrade" xy="640,0" size="320,1246" url="ui://kv0ad4wy9xlo4" autoSize="true"/>
+    <loader id="n8_wlc2" name="btnDecompose" xy="958,0" size="320,1246" url="ui://kv0ad4wyqyr69" autoSize="true"/>
+    <loader id="n9_v95q" name="loaLockIcon0" xy="160,623" pivot="0.5,0.5" anchor="true" size="320,1246" touchable="false" url="ui://kv0ad4wyv95qb" autoSize="true"/>
+    <loader id="n15_v95q" name="loaLockIcon1" xy="480,623" pivot="0.5,0.5" anchor="true" size="320,1246" touchable="false" url="ui://kv0ad4wyv95qa" autoSize="true"/>
+    <loader id="n12_v95q" name="loaLockIcon2" xy="800,623" pivot="0.5,0.5" anchor="true" size="320,1246" touchable="false" url="ui://kv0ad4wyv95qd" autoSize="true"/>
+    <loader id="n18_v95q" name="loaLockIcon3" xy="1120,623" pivot="0.5,0.5" anchor="true" size="320,1246" touchable="false" url="ui://kv0ad4wyv95qc" autoSize="true"/>
   </displayList>
 </component>

FGUIProject/assets/XiuFang/package.xml

@@ -10,6 +10,10 @@
     <image id="9xlo7" name="tzhc_ziti.png" path="/images/"/>
     <component id="wlc28" name="Component.xml" path="/components/"/>
     <image id="qyr69" name="tzhc_fzfj.png" path="/images/"/>
+    <image id="v95qa" name="tzhc_tzhc_an.png" path="/images/"/>
+    <image id="v95qb" name="tzhc_fzd_an.png" path="/images/"/>
+    <image id="v95qc" name="tzhc_fzfj_an.png" path="/images/"/>
+    <image id="v95qd" name="tzhc_fzsj_an.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\XiuFang" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>