Merge branch 'master' into Order

FGUIProject/assets/Arena/ArenaDanUpUI.xml

@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,950" opaque="false" designImage="ui://4lc5fhlbpsphg" designImageOffsetX="-19" designImageAlpha="0">
-  <controller name="c1" pages="0,,1," selected="0">
+  <controller name="c1" pages="0,,1," selected="1">
     <remark page="0" value="非首次段位提升"/>
     <remark page="1" value="首次段位提升"/>
   </controller>
   <displayList>
     <image id="n6_jcej" name="n6" src="jcej1p" fileName="images/pmts_ditu.png" xy="0,43"/>
     <image id="n4_jcej" name="n4" src="jcej40" fileName="images/dwjj_btbt.png" xy="67,-22"/>
-    <text id="n8_jcej" name="txtlastDanTitle" xy="474,419" pivot="0.5,0" size="132,44" group="n9_jcej" fontSize="32" color="#fef7f6" text="段位名字"/>
-    <loader id="n7_jcej" name="loaLastDanIcon" xy="415,161" pivot="0.5,0.5" size="250,250" group="n9_jcej" aspect="true" url="ui://4lc5fhlbe0505p" fill="scale" color="#666666"/>
-    <group id="n9_jcej" name="n9" xy="415,161" size="250,302" advanced="true"/>
-    <loader id="n2_psph" name="loaDanIcon" xy="415,161" size="250,250" group="n10_jcej" aspect="true" url="ui://4lc5fhlbe0505p" fill="scale"/>
-    <text id="n3_psph" name="txtDanTitle" xy="474,419" pivot="0.5,0" size="132,44" group="n10_jcej" fontSize="32" color="#fef7f6" text="段位名字"/>
-    <group id="n10_jcej" name="n10" xy="415,161" size="250,302" advanced="true"/>
+    <component id="n8_jcej" name="comLastDan" src="ofwu5q" fileName="components/ComDanIcon.xml" xy="204,160" pivot="0.5,0.5" size="250,302"/>
+    <component id="n2_psph" name="comCurDan" src="ofwu5q" fileName="components/ComDanIcon.xml" xy="623,160" pivot="0.5,0.5" size="250,302" aspect="true" controller="c1,1"/>
     <image id="n5_jcej" name="n5" src="jcej3z" fileName="images/pmts_ffbtbt.png" xy="422,540" group="n11_jcej"/>
     <list id="n1_psph" name="listFirstDanReward" xy="140,600" pivot="0.5,0" size="799,221" group="n11_jcej" layout="row" colGap="50" defaultItem="ui://eg2y0ldpj48o98" align="center" autoClearItems="true">
       <item/>
@@ -22,13 +18,15 @@
     <group id="n11_jcej" name="n11" xy="140,540" size="799,281" advanced="true">
       <gearDisplay controller="c1" pages="1"/>
     </group>
+    <image id="n12_ofwu" name="n12" src="ofwu5s" fileName="images/dwjs_jiantou.png" xy="465,257" size="149,69"/>
   </displayList>
   <transition name="t0">
-    <item time="0" type="Visible" target="n10_jcej" value="false"/>
+    <item time="0" type="Scale" target="n2_psph" value="0,0"/>
+    <item time="0" type="Scale" target="n8_jcej" tween="true" startValue="0,0" endValue="1,1" duration="6" ease="Linear"/>
+    <item time="0" type="Size" target="n12_ofwu" value="0,69"/>
     <item time="0" type="Visible" target="n11_jcej" value="false"/>
-    <item time="0" type="Visible" target="n9_jcej" value="true"/>
-    <item time="12" type="Visible" target="n10_jcej" value="true"/>
-    <item time="12" type="Visible" target="n9_jcej" value="false"/>
+    <item time="6" type="Size" target="n12_ofwu" tween="true" startValue="0,69" endValue="149,69" duration="6" ease="Linear"/>
+    <item time="12" type="Scale" target="n2_psph" tween="true" startValue="0,0" endValue="1,1" duration="6" ease="Linear"/>
     <item time="24" type="Visible" target="n11_jcej" value="true"/>
   </transition>
 </component>

FGUIProject/assets/Arena/components/ComDanIcon.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="250,302" overflow="hidden">
+  <controller name="c1" exported="true" pages="0,,1," selected="1"/>
+  <displayList>
+    <image id="n10_ofwu" name="n10" src="ofwu5r" fileName="images/dwjs_yz_db.png" xy="27,22" group="n9_jcej">
+      <gearDisplay controller="c1" pages="1"/>
+    </image>
+    <text id="n8_jcej" name="txtDanTitle" xy="59,258" pivot="0.5,0" size="132,44" group="n9_jcej" font="ui://eg2y0ldpa0cftkz" fontSize="32" color="#fef7f6" text="段位名字"/>
+    <loader id="n7_jcej" name="loaDanIcon" xy="0,0" pivot="0.5,0.5" size="250,250" group="n9_jcej" aspect="true" url="ui://4lc5fhlbe0505p" fill="scale"/>
+    <group id="n9_jcej" name="n9" xy="0,0" size="250,302" advanced="true"/>
+  </displayList>
+</component>

FGUIProject/assets/Arena/package.xml

@@ -186,6 +186,9 @@
     <image id="e0505n" name="tb_yz_11.png" path="/images/" exported="true"/>
     <image id="e0505o" name="tb_yz_12.png" path="/images/" exported="true"/>
     <image id="e0505p" name="tb_yz_13.png" path="/images/" exported="true"/>
+    <component id="ofwu5q" name="ComDanIcon.xml" path="/components/"/>
+    <image id="ofwu5r" name="dwjs_yz_db.png" path="/images/"/>
+    <image id="ofwu5s" name="dwjs_jiantou.png" path="/images/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Arena" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Card/components/ListCardItem.xml

@@ -4,7 +4,7 @@
     <component id="n6_ojlz" name="comCard" src="jzrr8n" fileName="components/ComCardMask.xml" xy="0,0"/>
     <image id="n27_qkjs" name="n27" src="qkjsav" fileName="imagesNew/name_underprint_card.png" xy="30,445" size="178,40"/>
     <image id="n20_pq5x" name="n20" src="pq5x60" fileName="images/kp_dikuang_1.png" xy="2,342"/>
-    <loader id="n23_94m1" name="loaBorder" xy="-2,-2" size="242,441" url="ui://7l6lvkay94m19w" autoSize="true"/>
+    <loader id="n23_94m1" name="loaBorder" xy="-2,-2" size="242,441" url="ui://eg2y0ldp94m19w" autoSize="true"/>
     <loader id="n19_pq5x" name="loaRarity" xy="178,14" size="44,94" url="ui://eg2y0ldpd4iw52" autoSize="true"/>
     <text id="n8_ojlz" name="txtLv" xy="170,394" pivot="1,0" size="55,34" fontSize="24" color="#fff9f1" align="right" leading="-5" text="30级"/>
     <text id="n9_ojlz" name="txtName" xy="56,443" pivot="0.5,0" size="126,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#ffffee" letterSpacing="-2" text="微光一瞬"/>

FGUIProject/assets/Card/package.xml

@@ -90,10 +90,6 @@
     <component id="rhha9q" name="ComSkillDiscribe.xml" path="/components/"/>
     <component id="qgxy9r" name="ComImgCard.xml" path="/components/"/>
     <component id="qgxy9s" name="ComCardImgRes.xml" path="/components/"/>
-    <image id="94m19t" name="kp_kuang_3.png" path="/images/" exported="true"/>
-    <image id="94m19u" name="kp_kuang_2.png" path="/images/" exported="true"/>
-    <image id="94m19v" name="kp_kuang_1.png" path="/images/" exported="true"/>
-    <image id="94m19w" name="kp_kuang_4.png" path="/images/" exported="true"/>
     <image id="r9ri9x" name="kp_mudan.jpg" path="/images/"/>
     <image id="ysx99y" name="cpcp_ziti.png" path="/images/"/>
     <component id="xtmo9z" name="CardStarRewardUI.xml" path="/" exported="true"/>

FGUIProject/assets/Common/components/BtnSmall.xml

@@ -3,7 +3,7 @@
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
     <loader id="n4_u2u3" name="icon" xy="0,0" size="214,51" aspect="true" url="ui://mk0fwx0xa0cf2w" fill="scale" autoSize="true"/>
-    <text id="n3_u2u3" name="title" xy="102,2" pivot="0.5,0" size="10,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#865118" align="center" text="">
+    <text id="n3_u2u3" name="title" xy="102,3" pivot="0.5,0" size="10,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#865118" align="center" text="">
       <relation target="" sidePair="middle-middle,left-right"/>
     </text>
   </displayList>

FGUIProject/assets/Common/components/Button10.xml

@@ -2,10 +2,10 @@
 <component size="380,105" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n0_ih75" name="n0" src="ih7592" fileName="images/tctc_anniu_1.png" xy="0,0">
+    <image id="n0_ih75" name="n0" src="ih7592" fileName="imagesExport/tctc_anniu_1.png" xy="0,0">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <text id="n1_ih75" name="title" xy="0,0" size="380,105" fontSize="46" color="#fff7e4" align="center" vAlign="middle" letterSpacing="2" autoSize="none" strokeColor="#ac904e" singleLine="true" text="确定">
+    <text id="n1_ih75" name="title" xy="0,0" size="380,105" font="ui://eg2y0ldpa0cftkz" fontSize="46" color="#fff7e4" align="center" vAlign="middle" letterSpacing="2" autoSize="none" strokeColor="#ac904e" singleLine="true" text="确定">
       <relation target="" sidePair="width-width,height-height"/>
     </text>
   </displayList>

FGUIProject/assets/Common/components/Button11.xml

@@ -2,10 +2,10 @@
 <component size="380,105" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n0_ih75" name="n0" src="ih7591" fileName="images/tctc_anniu_2.png" xy="0,0">
+    <image id="n0_ih75" name="n0" src="ih7591" fileName="imagesExport/tctc_anniu_2.png" xy="0,0">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <text id="n1_ih75" name="title" xy="0,0" size="380,105" fontSize="46" color="#fff7e4" align="center" vAlign="middle" letterSpacing="2" autoSize="none" strokeColor="#a8935f" singleLine="true" text="重置">
+    <text id="n1_ih75" name="title" xy="0,0" size="380,105" font="ui://eg2y0ldpa0cftkz" fontSize="46" color="#fff7e4" align="center" vAlign="middle" letterSpacing="2" autoSize="none" strokeColor="#a8935f" singleLine="true" text="重置">
       <relation target="" sidePair="width-width,height-height"/>
     </text>
   </displayList>

FGUIProject/assets/CommonGame/components/ComCostCurrency.xml

@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="114,46">
+<component size="119,46">
   <controller name="c1" exported="true" pages="0,,1," selected="1">
     <remark page="0" value="免费"/>
     <remark page="1" value="付费"/>
   </controller>
-  <controller name="style" exported="true" pages="0,,1,,2," selected="2">
+  <controller name="style" exported="true" pages="0,,1,,2," selected="0">
     <remark page="0" value="默认"/>
   </controller>
   <displayList>
-    <loader id="n1_ojlz" name="loaIcon" xy="0,3" size="40,40" group="n7_si5z" aspect="true" url="ui://eg2y0ldpq08x3" fill="scale"/>
-    <text id="n6_j5a5" name="txtNeed" xy="45,0" size="69,46" group="n7_si5z" font="ui://eg2y0ldpa0cftks" fontSize="34" color="#fff6ed" align="center" vAlign="middle" ubb="true" autoClearText="true" text="9999">
+    <loader id="n1_ojlz" name="loaIcon" xy="0,0" size="45,45" group="n7_si5z" aspect="true" url="ui://eg2y0ldpq08x3" fill="scale"/>
+    <text id="n6_j5a5" name="txtNeed" xy="50,0" size="69,46" group="n7_si5z" font="ui://eg2y0ldpa0cftks" fontSize="34" color="#716b59" align="center" vAlign="middle" ubb="true" autoClearText="true" text="9999">
       <gearColor controller="style" pages="1,2" values="#8c8580,#000000|#fff6ed,#000000" default="#716b59,#000000"/>
     </text>
-    <group id="n7_si5z" name="n7" xy="0,0" size="114,46" advanced="true" layout="hz" colGap="5" excludeInvisibles="true">
+    <group id="n7_si5z" name="n7" xy="0,0" size="119,46" advanced="true" layout="hz" colGap="5" excludeInvisibles="true">
       <gearDisplay controller="c1" pages="1"/>
       <relation target="" sidePair="center-center"/>
     </group>
-    <text id="n11_a0cf" name="n11" xy="20,0" pivot="0.5,0" size="71,46" font="ui://eg2y0ldpa0cftks" fontSize="34" color="#716b59" align="center" text="免费">
+    <text id="n11_a0cf" name="n11" xy="22,0" pivot="0.5,0" size="71,46" font="ui://eg2y0ldpa0cftks" fontSize="34" color="#716b59" align="center" text="免费">
       <gearDisplay controller="c1" pages="0"/>
       <relation target="" sidePair="center-center"/>
     </text>

FGUIProject/assets/CommonGame/package.xml

@@ -274,7 +274,7 @@
     <component id="o9ghtlq" name="ComHead2.xml" path="/components/" exported="true"/>
     <image id="a0cf2l" name="lm_huizhangdk.png" path="/imagesNew/"/>
     <component id="o9ghtlr" name="ComHeadLv1.xml" path="/components/" exported="true"/>
-    <image id="a0cf2k" name="lm_db_lvl.png" path="/imagesNew/"/>
+    <image id="a0cf2k" name="lm_db_lvl.png" path="/imagesNew/" exported="true"/>
     <component id="9jv6tls" name="ComItem001_2.xml" path="/components/" exported="true"/>
     <component id="9jv6tlt" name="ComIcon001.xml" path="/components/"/>
     <image id="9jv6tlu" name="lm_daoju_db.png" path="/images/"/>
@@ -363,6 +363,11 @@
     <image id="e050to7" name="tb_yajizijin.png" path="/imgItemIcon/" exported="true"/>
     <image id="e050to8" name="tb_zhizaoli.png" path="/imgItemIcon/" exported="true"/>
     <component id="e050tob" name="Component2.xml" path="/componentsBg/"/>
+    <image id="94m19v" name="kp_kuang_1.png" path="/imagesExport/" exported="true" scale="9grid" scale9grid="40,110,51,220"/>
+    <image id="94m19u" name="kp_kuang_2.png" path="/imagesExport/" exported="true" scale="9grid" scale9grid="39,110,61,220"/>
+    <image id="94m19t" name="kp_kuang_3.png" path="/imagesExport/" exported="true" scale="9grid" scale9grid="38,110,53,220"/>
+    <image id="94m19w" name="kp_kuang_4.png" path="/imagesExport/" exported="true" scale="9grid" scale9grid="44,110,54,220"/>
+    <image id="ofwutoc" name="card_jn_db.png" path="/imagesNew/" exported="true"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/DressUp/DressUpFightUI.xml

@@ -17,17 +17,17 @@
         <item title="5"/>
       </ComboBox>
     </component>
-    <component id="n1_qsvd" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,60" group="n38_8lqj">
+    <component id="n1_qsvd" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,60" group="n38_8lqj">
       <Button icon="ui://eg2y0ldpuyuxtj4"/>
     </component>
     <component id="n2_qsvd" name="btnHome" src="qp4l60" fileName="components/ButtonHome.xml" pkg="eg2y0ldp" xy="35,200" group="n38_8lqj" visible="false">
       <relation target="n1_qsvd" sidePair="left-left,top-top"/>
     </component>
     <image id="n50_f2bf" name="n50" src="f2bfey" fileName="images/dz_cdxzcdxz.png" xy="837,60" group="n51_f2bf"/>
-    <text id="n49_f2bf" name="txtDressLimit" xy="857,63" size="216,35" group="n51_f2bf" fontSize="25" color="#7a5e38" text="饰品穿戴限制：0/5"/>
+    <text id="n49_f2bf" name="txtDressLimit" xy="857,63" size="213,35" group="n51_f2bf" fontSize="25" color="#7a5e38" text="饰品穿戴限制：0/5"/>
     <group id="n51_f2bf" name="n51" xy="837,60" size="243,44" group="n38_8lqj"/>
     <image id="n16_8xpg" name="n16" src="j48o3z" fileName="images/dz_hz_fsk_1.png" xy="24,230" group="n33_j48o"/>
-    <loader id="n24_d4iw" name="scoreType" xy="23,232" size="50,50" group="n33_j48o" url="ui://eg2y0ldp842s6h" fill="scale"/>
+    <loader id="n24_d4iw" name="scoreType" xy="23,233" size="50,50" group="n33_j48o" url="ui://eg2y0ldp842s6h" fill="scale"/>
     <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"/>
@@ -82,7 +82,7 @@
     <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>
-    <text id="n26_bx8o" name="txtRecommendCount" xy="305,1843" size="314,44" group="n38_8lqj" visible="false" fontSize="32" color="#f0eeee" align="center" vars="true" text="今日剩余次数：{v1=10}/{v2=10}">
+    <text id="n26_bx8o" name="txtRecommendCount" xy="305,1843" size="304,44" group="n38_8lqj" visible="false" fontSize="32" color="#f0eeee" align="center" vars="true" text="今日剩余次数：{v1=10}/{v2=10}">
       <relation target="" sidePair="bottom-bottom"/>
     </text>
     <group id="n38_8lqj" name="graContent" xy="0,0" size="1310,1920" advanced="true">

FGUIProject/assets/DressUp/components/PartsListItem.xml

@@ -8,7 +8,8 @@
     </loader>
     <loader id="n7_d4iw" name="rarity" xy="173,10" size="44,94" url="ui://eg2y0ldpd4iw52" autoSize="true"/>
     <loader id="n5_8xpg" name="ScoreType" xy="24,142" size="50,50" touchable="false" url="ui://eg2y0ldp842s6h" fill="scale"/>
-    <text id="n6_8xpg" name="txtScore" xy="150,160" pivot="0.5,0" size="54,36" fontSize="26" color="#a07b41" align="center" autoClearText="true" text="3500"/>
+    <image id="n13_ofwu" name="n13" src="ofwuf8" fileName="images/huanzhuang_sz_db.png" xy="138,164"/>
+    <text id="n6_8xpg" name="txtScore" xy="146,156" pivot="0.5,0" size="66,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#e9e2d1" align="center" autoClearText="true" text="3500"/>
     <image id="n8_pjip" name="imgNeed" src="pjip2z" fileName="images/hz_bcbc_1.png" xy="13,0" size="67,68"/>
     <image id="n10_ovm4" name="imgNew" src="pzq19p" fileName="imagesExport/cj_hd_xin.png" pkg="eg2y0ldp" xy="0,70" size="70,70"/>
     <image id="n2_k6he" name="n2" src="k6he1y" fileName="images/hz_minzikuang.png" xy="13,198" size="208,42" group="n11_wono"/>

FGUIProject/assets/DressUp/package.xml

@@ -197,6 +197,7 @@
     <image id="v461f4" name="jjcdi_jjcdi.png" path="/images/"/>
     <image id="v461f5" name="jjcdi_jjxian.png" path="/images/"/>
     <image id="ofwuf7" name="tb_gou_yiyongyou.png" path="/imagesNew/"/>
+    <image id="ofwuf8" name="huanzhuang_sz_db.png" path="/images/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/DressUp" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/League/LeagueChatUI.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920">
+  <displayList>
+    <loader id="n6_ofwu" name="loaBg" xy="0,0" size="1080,1920">
+      <relation target="" sidePair="width-width,height-height"/>
+    </loader>
+    <loader id="n8_ofwu" name="n8" xy="0,1009" size="1080,911" group="n5_ofwu" url="ui://tw70qm9dofwu8c" autoSize="true"/>
+    <list id="n7_ofwu" name="list" xy="0,1063" size="1080,681" group="n5_ofwu" overflow="scroll" lineGap="10" defaultItem="ui://tw70qm9dofwu8e">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <image id="n1_ofwu" name="n1" src="9jv667" fileName="images/lm_dt_srdb.png" xy="0,1665" group="n5_ofwu"/>
+    <image id="n2_ofwu" name="n2" src="a0cf2g" fileName="images/lm_sousuok.png" xy="84,1779" group="n5_ofwu"/>
+    <text id="n3_ofwu" name="txtChat" xy="110,1784" size="653,44" group="n5_ofwu" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#b4905d" letterSpacing="-2" vars="true" autoSize="none" text="" input="true" prompt="[color=#A7957E]最多输入50个字[/color]" maxLength="50"/>
+    <component id="n4_ofwu" name="btnSend" src="rv091o" fileName="components/Button11.xml" pkg="eg2y0ldp" xy="799,1775" size="198,61" group="n5_ofwu">
+      <Button title="发送"/>
+    </component>
+    <group id="n5_ofwu" name="n5" xy="0,1009" size="1080,911" advanced="true">
+      <relation target="" sidePair="bottom-bottom"/>
+    </group>
+  </displayList>
+</component>

FGUIProject/assets/League/LeagueUI.xml

@@ -36,7 +36,11 @@
     <text id="n14_u2u3" name="txtLeaderName" xy="815,232" size="162,34" group="n26_o9gh" font="ui://eg2y0ldpa0cftkz" fontSize="24" color="#923c1a" autoClearText="true" text="会长名字7个字"/>
     <text id="n15_u2u3" name="txtNotice" xy="617,284" size="396,69" group="n26_o9gh" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#915e15" leading="-4" autoSize="height" autoClearText="true" text="联盟公告联盟公告联盟公盟公联盟联盟公告联盟公告联盟"/>
     <text id="n29_o9gh" name="n29" xy="819,205" size="39,26" group="n26_o9gh" font="ui://eg2y0ldpa0cftkz" fontSize="18" color="#fffbed" text="社长"/>
-    <group id="n26_o9gh" name="n26" xy="599,191" size="444,230"/>
+    <component id="n34_ofwu" name="btnChat" src="rv091l" fileName="components/Button10.xml" xy="966,408" size="66,66" group="n26_o9gh">
+      <relation target="n25_o9gh" sidePair="right-right,top-bottom"/>
+      <Button icon="ui://tw70qm9dofwu8g"/>
+    </component>
+    <group id="n26_o9gh" name="n26" xy="599,191" size="444,283"/>
     <component id="n7_u2u3" name="btnPray" src="u2u314" fileName="components/ButtonModle6.xml" xy="70,446" group="n9_u2u3"/>
     <component id="n3_u2u3" name="btnSkill" src="u2u3u" fileName="components/ButtonModle2.xml" xy="343,669" group="n9_u2u3"/>
     <component id="n4_u2u3" name="btnGift" src="u2u3y" fileName="components/ButtonModle3.xml" xy="755,894" group="n9_u2u3"/>

FGUIProject/assets/League/components/ListChatAnswerItem.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="670,155">
+  <displayList>
+    <component id="n31_pvb4" name="comHead" src="o9ghtlp" fileName="components/ComHeadWithLv2.xml" pkg="eg2y0ldp" xy="0,0" size="230,218" scale="0.5,0.5">
+      <relation target="" sidePair="height-height,left-left"/>
+    </component>
+    <text id="n32_pvb4" name="txtName" xy="113,20" size="166,35" group="n37_pvb4" font="ui://eg2y0ldpa0cftks" fontSize="25" color="#923c1a" align="center" letterSpacing="-2" text="玩家名字七个字"/>
+    <loader id="n36_pvb4" name="loaTitle" xy="284,23" size="117,28" group="n37_pvb4" autoSize="true"/>
+    <group id="n37_pvb4" name="n37" xy="113,20" size="288,35" advanced="true" layout="hz" colGap="5" excludeInvisibles="true">
+      <relation target="" sidePair="left-left"/>
+    </group>
+    <image id="n35_pvb4" name="n35" src="9jv66t" fileName="images/lm_dt_dhdk.png" xy="113,62" size="389,84" group="n38_9jv6">
+      <relation target="n34_pvb4" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n34_pvb4" name="txtChatContent" xy="145,66" size="340,73" group="n38_9jv6" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#915e15" leading="0" ubb="true" vars="true" autoClearText="true" text="玩家发言内容玩家发言内容&#xA;玩家发言\n内容玩家"/>
+    <group id="n38_9jv6" name="n38" xy="113,62" size="389,84"/>
+  </displayList>
+  <relation target="n34_pvb4" sidePair="height-height"/>
+</component>

FGUIProject/assets/League/components/ListChatAnswerItemMine.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="670,116">
+  <displayList>
+    <component id="n31_pvb4" name="comHead" src="o9ghtlp" fileName="components/ComHeadWithLv2.xml" pkg="eg2y0ldp" xy="498,-57" pivot="0.5,0.5" group="n41_miy3" scale="0.5,0.5">
+      <relation target="" sidePair="right-right"/>
+    </component>
+    <loader id="n36_pvb4" name="loaTitle" xy="259,29" size="117,28" group="n37_pvb4" url="ui://tw70qm9d9jv66k" autoSize="true"/>
+    <text id="n32_pvb4" name="txtName" xy="381,24" size="166,35" group="n37_pvb4" font="ui://eg2y0ldpa0cftks" fontSize="25" color="#923c1a" align="center" letterSpacing="-2" text="玩家名字七个字"/>
+    <group id="n37_pvb4" name="n37" xy="259,24" size="288,35" group="n41_miy3" advanced="true" layout="hz" colGap="5" excludeInvisibles="true">
+      <relation target="" sidePair="right-right"/>
+    </group>
+    <image id="n35_pvb4" name="n35" src="9jv66u" fileName="images/lm_dt_dhdk2.png" xy="159,69" pivot="1,0" size="390,46" group="n38_9jv6">
+      <relation target="n34_pvb4" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n34_pvb4" name="txtChatContent" xy="180,74" pivot="1,0" size="340,39" group="n38_9jv6" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#95514d" leading="0" text="玩家发言内容玩家发言内容"/>
+    <group id="n38_9jv6" name="n38" xy="159,69" size="390,46" group="n41_miy3" advanced="true">
+      <relation target="" sidePair="right-right"/>
+    </group>
+    <group id="n41_miy3" name="n41" xy="159,-57" size="569,230"/>
+  </displayList>
+  <relation target="n34_pvb4" sidePair="height-height"/>
+</component>

FGUIProject/assets/League/components/ListChatItem.xml

@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="670,155">
+<component size="1080,155">
   <displayList>
-    <component id="n31_pvb4" name="comHead" src="o9ghtlp" fileName="components/ComHeadWithLv2.xml" pkg="eg2y0ldp" xy="0,0" size="230,218" scale="0.5,0.5">
+    <component id="n31_pvb4" name="comHead" src="o9ghtlp" fileName="components/ComHeadWithLv2.xml" pkg="eg2y0ldp" xy="30,0" size="230,218" group="n39_ofwu" scale="0.5,0.5">
       <relation target="" sidePair="height-height,left-left"/>
     </component>
-    <text id="n32_pvb4" name="txtName" xy="113,20" size="166,35" group="n37_pvb4" font="ui://eg2y0ldpa0cftks" fontSize="25" color="#923c1a" align="center" letterSpacing="-2" text="玩家名字七个字"/>
-    <loader id="n36_pvb4" name="loaTitle" xy="284,23" size="117,28" group="n37_pvb4" autoSize="true"/>
-    <group id="n37_pvb4" name="n37" xy="113,20" size="288,35" advanced="true" layout="hz" colGap="5" excludeInvisibles="true">
+    <text id="n32_pvb4" name="txtName" xy="143,20" size="166,35" group="n37_pvb4" font="ui://eg2y0ldpa0cftks" fontSize="25" color="#923c1a" align="center" letterSpacing="-2" text="玩家名字七个字"/>
+    <loader id="n36_pvb4" name="loaTitle" xy="314,23" size="117,28" group="n37_pvb4" autoSize="true"/>
+    <group id="n37_pvb4" name="n37" xy="143,20" size="288,35" group="n39_ofwu" advanced="true" layout="hz" colGap="5" excludeInvisibles="true">
       <relation target="" sidePair="left-left"/>
     </group>
-    <image id="n35_pvb4" name="n35" src="9jv66t" fileName="images/lm_dt_dhdk.png" xy="113,62" size="389,84" group="n38_9jv6">
+    <image id="n35_pvb4" name="n35" src="9jv66t" fileName="images/lm_dt_dhdk.png" xy="143,62" size="389,84" group="n38_9jv6">
       <relation target="n34_pvb4" sidePair="width-width,height-height"/>
     </image>
-    <text id="n34_pvb4" name="txtChatContent" xy="145,66" size="340,73" group="n38_9jv6" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#915e15" leading="0" ubb="true" vars="true" autoClearText="true" text="玩家发言内容玩家发言内容&#xA;玩家发言\n内容玩家"/>
-    <group id="n38_9jv6" name="n38" xy="113,62" size="389,84"/>
+    <text id="n34_pvb4" name="txtChatContent" xy="175,66" size="340,73" group="n38_9jv6" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#915e15" leading="0" ubb="true" vars="true" autoClearText="true" text="玩家发言内容玩家发言内容&#xA;玩家发言\n内容玩家"/>
+    <group id="n38_9jv6" name="n38" xy="143,62" size="389,84" group="n39_ofwu"/>
+    <group id="n39_ofwu" name="n39" xy="30,0" size="502,218"/>
   </displayList>
   <relation target="n34_pvb4" sidePair="height-height"/>
 </component>

FGUIProject/assets/League/components/ListChatItemMine.xml

@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="670,116">
+<component size="1080,116">
   <displayList>
-    <component id="n31_pvb4" name="comHead" src="o9ghtlp" fileName="components/ComHeadWithLv2.xml" pkg="eg2y0ldp" xy="498,-57" pivot="0.5,0.5" group="n41_miy3" scale="0.5,0.5">
+    <component id="n31_pvb4" name="comHead" src="o9ghtlp" fileName="components/ComHeadWithLv2.xml" pkg="eg2y0ldp" xy="875,-57" pivot="0.5,0.5" group="n41_miy3" scale="0.5,0.5">
       <relation target="" sidePair="right-right"/>
     </component>
-    <loader id="n36_pvb4" name="loaTitle" xy="259,29" size="117,28" group="n37_pvb4" url="ui://tw70qm9d9jv66k" autoSize="true"/>
-    <text id="n32_pvb4" name="txtName" xy="381,24" size="166,35" group="n37_pvb4" font="ui://eg2y0ldpa0cftks" fontSize="25" color="#923c1a" align="center" letterSpacing="-2" text="玩家名字七个字"/>
-    <group id="n37_pvb4" name="n37" xy="259,24" size="288,35" group="n41_miy3" advanced="true" layout="hz" colGap="5" excludeInvisibles="true">
+    <loader id="n36_pvb4" name="loaTitle" xy="636,29" size="117,28" group="n37_pvb4" url="ui://tw70qm9d9jv66k" autoSize="true"/>
+    <text id="n32_pvb4" name="txtName" xy="758,24" size="166,35" group="n37_pvb4" font="ui://eg2y0ldpa0cftks" fontSize="25" color="#923c1a" align="center" letterSpacing="-2" text="玩家名字七个字"/>
+    <group id="n37_pvb4" name="n37" xy="636,24" size="288,35" group="n41_miy3" advanced="true" layout="hz" colGap="5" excludeInvisibles="true">
       <relation target="" sidePair="right-right"/>
     </group>
-    <image id="n35_pvb4" name="n35" src="9jv66u" fileName="images/lm_dt_dhdk2.png" xy="159,69" pivot="1,0" size="390,46" group="n38_9jv6">
+    <image id="n35_pvb4" name="n35" src="9jv66u" fileName="images/lm_dt_dhdk2.png" xy="536,69" pivot="1,0" size="390,46" group="n38_9jv6">
       <relation target="n34_pvb4" sidePair="width-width,height-height"/>
     </image>
-    <text id="n34_pvb4" name="txtChatContent" xy="180,74" pivot="1,0" size="340,39" group="n38_9jv6" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#95514d" leading="0" text="玩家发言内容玩家发言内容"/>
-    <group id="n38_9jv6" name="n38" xy="159,69" size="390,46" group="n41_miy3" advanced="true">
+    <text id="n34_pvb4" name="txtChatContent" xy="557,74" pivot="1,0" size="340,39" group="n38_9jv6" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#95514d" leading="0" text="玩家发言内容玩家发言内容"/>
+    <group id="n38_9jv6" name="n38" xy="536,69" size="390,46" group="n41_miy3" advanced="true">
       <relation target="" sidePair="right-right"/>
     </group>
-    <group id="n41_miy3" name="n41" xy="159,-57" size="569,230"/>
+    <group id="n41_miy3" name="n41" xy="536,-57" size="569,230" advanced="true"/>
   </displayList>
   <relation target="n34_pvb4" sidePair="height-height"/>
 </component>

FGUIProject/assets/League/components/ListSkillItem.xml

@@ -11,5 +11,6 @@
     <image id="n17_gfx4" name="imgLock" src="miy37h" fileName="images/lm_ch_wdl_zz.png" xy="-6,-6"/>
     <image id="n21_miy3" name="imgSuo" src="miy37t" fileName="imagesNew/tb_suo.png" pkg="eg2y0ldp" xy="59,75"/>
     <component id="n12_pvb4" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="16,127" pivot="0.5,0" scale="0.75,0.75" controller="c1,1"/>
+    <graph id="n24_ofwu" name="holder" xy="76,76" size="10,10"/>
   </displayList>
 </component>

FGUIProject/assets/League/package.xml

@@ -112,8 +112,8 @@
     <component id="pvb452" name="LeagueAnswerUI.xml" path="/" exported="true"/>
     <component id="pvb453" name="LeagueAnsweringUI.xml" path="/" exported="true"/>
     <component id="pvb455" name="ListAnswerJoinItem.xml" path="/components/"/>
-    <component id="pvb456" name="ListChatItem.xml" path="/components/" exported="true"/>
-    <component id="pvb457" name="ListChatItemMine.xml" path="/components/" exported="true"/>
+    <component id="pvb456" name="ListChatAnswerItem.xml" path="/components/" exported="true"/>
+    <component id="pvb457" name="ListChatAnswerItemMine.xml" path="/components/" exported="true"/>
     <component id="pvb458" name="LeagueAnswerRewardUI.xml" path="/" exported="true"/>
     <component id="pvb459" name="ListAnswerRewardItem.xml" path="/components/"/>
     <component id="pvb45a" name="LeagueSkillUI.xml" path="/" exported="true"/>
@@ -211,6 +211,11 @@
     <image id="ofwu89" name="tb_xiang_suhexiang.png" path="/images/"/>
     <image id="ofwu8a" name="tb_xiang_tianmuxiang.png" path="/images/"/>
     <image id="ofwu8b" name="tb_xiang_baitanxiang.png" path="/images/"/>
+    <image id="ofwu8c" name="zhj_liaotian_db.png" path="/images/"/>
+    <component id="ofwu8d" name="LeagueChatUI.xml" path="/" exported="true"/>
+    <component id="ofwu8e" name="ListChatItem.xml" path="/components/" exported="true"/>
+    <component id="ofwu8f" name="ListChatItemMine.xml" path="/components/" exported="true"/>
+    <image id="ofwu8g" name="lm_tb_liaotian.png" path="/images/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/League" packageCount="2" genCode="true" maxAtlasSize="2048" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Main/ListCardSkillItem.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="108,108">
+  <displayList>
+    <image id="n16_ofwu" name="n16" src="ofwutoc" fileName="imagesNew/card_jn_db.png" pkg="eg2y0ldp" xy="0,0"/>
+    <component id="n14_ofwu" name="comSkill" src="ofwup1" fileName="ListCardSkillItemMask.xml" xy="6,6"/>
+    <image id="n17_ofwu" name="n17" src="a0cf2k" fileName="imagesNew/lm_db_lvl.png" pkg="eg2y0ldp" xy="70,71" group="n19_ofwu"/>
+    <text id="n18_ofwu" name="txtLv" xy="80,65" pivot="0.5,0" size="20,44" group="n19_ofwu" fontSize="32" color="#fdfaf3" align="center" text="9"/>
+    <group id="n19_ofwu" name="n19" xy="70,65" size="39,45"/>
+  </displayList>
+</component>

FGUIProject/assets/Main/ListCardSkillItemMask.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="96,96" mask="n16_ofwu">
+  <displayList>
+    <image id="n14_ofwu" name="n14" src="ofwutoc" fileName="imagesNew/card_jn_db.png" pkg="eg2y0ldp" xy="-6,-6"/>
+    <loader id="n15_ofwu" name="loaSkill" xy="-69,-59" size="234,432" url="ui://eg2y0ldpqkjstlc" autoSize="true"/>
+    <graph id="n16_ofwu" name="n16" xy="2,2" size="92,92" type="eclipse" lineSize="0"/>
+  </displayList>
+</component>

FGUIProject/assets/Main/StoryCardChooseUI.xml

@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="976,1300">
+<component size="1080,1300">
   <displayList>
-    <image id="n7_sx2v" name="n7" src="sx2v9r" fileName="imagesStory/zd_tctcdi_1.png" xy="1,-365"/>
-    <image id="n9_wzce" name="n9" src="sx2v9u" fileName="imagesStory/zd_tctcxian_1.png" xy="269,178"/>
-    <loader id="n4_cn27" name="loaScore" xy="614,112" size="58,58" url="ui://eg2y0ldp842s6h" autoSize="true"/>
-    <text id="n5_cn27" name="txtName" xy="391,107" pivot="0.5,0" size="202,66" fontSize="50" color="#9b7853" autoClearText="true" text="技能名字"/>
-    <text id="n6_cn27" name="txtDiscribe" xy="67,217" size="847,89" fontSize="34" color="#a28d77" autoSize="none" autoClearText="true" text="旋律在指尖流转，在天幕中划出一道起伏的星轨折线谱， 爱与星光星幕下的奏鸣！"/>
-    <text id="n11_wzce" name="txtTips" xy="653,342" size="267,51" fontSize="38" color="#c67c6b" text="选择适合的词牌"/>
-    <image id="n10_wzce" name="n10" src="sx2v9q" fileName="imagesStory/zd_tctcxian_2.png" xy="614,360"/>
-    <list id="n0_r1a9" name="listCard" xy="27,415" size="923,657" layout="flow_hz" overflow="scroll" lineGap="21" colGap="20" defaultItem="ui://mfvz4q8kr1a99f" autoClearItems="true">
+    <image id="n7_sx2v" name="n7" src="sx2v9r" fileName="imagesStory/zd_tctcdi_1.png" xy="23,-365"/>
+    <image id="n9_wzce" name="n9" src="sx2v9u" fileName="imagesStory/zd_tctcxian_1.png" xy="320,178"/>
+    <loader id="n4_cn27" name="loaScore" xy="658,114" size="58,58" aspect="true" url="ui://eg2y0ldp842s6h" fill="scaleMatchWidth">
+      <relation target="n5_cn27" sidePair="left-right"/>
+    </loader>
+    <text id="n5_cn27" name="txtName" xy="439,107" pivot="0.5,0" size="202,66" font="ui://eg2y0ldpa0cftkz" fontSize="50" color="#9b7853" autoClearText="true" text="技能名字"/>
+    <list id="n0_r1a9" name="listCard" xy="84,415" size="912,657" layout="flow_hz" overflow="scroll" lineGap="15" colGap="10" defaultItem="ui://mfvz4q8kr1a99f" autoClearItems="true">
       <item/>
       <item/>
       <item/>
@@ -20,11 +19,23 @@
       <item/>
       <item/>
     </list>
-    <component id="n2_r1a9" name="btnCancel" src="r9ritjh" fileName="components/Button18.xml" pkg="mk0fwx0x" xy="95,1113">
+    <component id="n2_r1a9" name="btnCancel" src="ih7595" fileName="components/Button11.xml" pkg="mk0fwx0x" xy="129,1113" group="n12_ofwu">
       <Button title="取消"/>
     </component>
-    <component id="n3_r1a9" name="btnConfirm" src="wonody" fileName="components/Button19.xml" pkg="mk0fwx0x" xy="537,1113">
+    <component id="n3_r1a9" name="btnConfirm" src="ih7594" fileName="components/Button10.xml" pkg="mk0fwx0x" xy="571,1113" group="n12_ofwu">
       <Button title="确认"/>
     </component>
+    <group id="n12_ofwu" name="n12" xy="129,1113" size="822,105"/>
+    <component id="n13_ofwu" name="btnUpCard" src="rv091e" fileName="components/BtnSmall.xml" pkg="mk0fwx0x" xy="768,245">
+      <Button title="提升词牌"/>
+    </component>
+    <list id="n15_ofwu" name="listSkill" xy="99,207" size="365,110" layout="row" overflow="scroll" colGap="16" defaultItem="ui://mfvz4q8kofwup0">
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <text id="n11_wzce" name="txtTips" xy="719,342" size="267,52" group="n16_ofwu" font="ui://eg2y0ldpa0cftkz" fontSize="38" color="#c67c6b" text="选择适合的词牌"/>
+    <image id="n10_wzce" name="n10" src="sx2v9q" fileName="imagesStory/zd_tctcxian_2.png" xy="680,360" group="n16_ofwu"/>
+    <group id="n16_ofwu" name="n16" xy="680,342" size="306,52"/>
   </displayList>
 </component>

FGUIProject/assets/Main/components/ListCardItem.xml

@@ -1,22 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="215,270" extention="Button">
+<component size="220,279" extention="Button">
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
-    <component id="n9_wzce" name="comCardMask" src="wzce9v" fileName="components/ComCardMask.xml" xy="0,1"/>
-    <image id="n8_sx2v" name="n8" src="sx2v9s" fileName="imagesStory/zd_tctcdikugn_1.png" xy="1,154"/>
-    <text id="n3_r1a9" name="txtName" xy="55,228" size="105,46" fontSize="34" color="#6a5d56" text="赵钱孙"/>
-    <text id="n12_wzce" name="txtLv" xy="157,192" pivot="1,0" size="51,34" fontSize="24" color="#fff9f1" align="right" leading="-8" ubb="true" vars="true" text="30级"/>
-    <loader id="n7_sx2v" name="loaRarity" xy="162,10" size="44,94" url="ui://eg2y0ldpd4iw52" autoSize="true"/>
-    <loader id="n16_qr4e" name="loaMainScore" xy="9,11" size="46,46" aspect="true" url="ui://eg2y0ldp842s6h" fill="scaleMatchHeight"/>
-    <image id="n15_dcro" name="n15" src="sx2v9t" fileName="imagesStory/zd_tctcdikugn_2.png" xy="-1,0"/>
-    <graph id="n13_dcro" name="holder" xy="107,114" size="1,1" touchable="false" type="rect">
-      <gearDisplay controller="button" pages="1"/>
-    </graph>
-    <text id="n18_v461" name="txtStarLv" xy="156,171" pivot="1,0" size="27,34" group="n19_v461" fontSize="24" color="#fff9f1" align="right" leading="-5" text="30"/>
-    <image id="n17_v461" name="n17" src="pq5x64" fileName="imagesExport/kp_xingx.png" pkg="eg2y0ldp" xy="183,175" group="n19_v461"/>
-    <group id="n19_v461" name="n19" xy="156,171" size="53,34" advanced="true" layout="hz" excludeInvisibles="true">
+    <component id="n9_wzce" name="comCardMask" src="wzce9v" fileName="components/ComCardMask.xml" xy="4,3" group="n23_ofwu"/>
+    <image id="n8_sx2v" name="n8" src="sx2v9s" fileName="imagesStory/zd_tctcdikugn_1.png" xy="5,156" group="n23_ofwu"/>
+    <text id="n3_r1a9" name="txtName" xy="57,236" size="105,46" group="n23_ofwu" font="ui://eg2y0ldpa0cftkz" fontSize="34" color="#6a5d56" text="赵钱孙"/>
+    <text id="n12_wzce" name="txtLv" xy="153,192" pivot="1,0" size="51,34" group="n23_ofwu" fontSize="24" color="#fff9f1" align="right" leading="-8" ubb="true" vars="true" text="30级"/>
+    <text id="n18_v461" name="txtStarLv" xy="153,173" pivot="1,0" size="27,34" group="n19_v461" fontSize="24" color="#fff9f1" align="right" leading="-5" text="30"/>
+    <image id="n17_v461" name="n17" src="pq5x64" fileName="imagesExport/kp_xingx.png" pkg="eg2y0ldp" xy="180,177" group="n19_v461"/>
+    <group id="n19_v461" name="n19" xy="153,173" size="53,34" group="n23_ofwu" advanced="true" layout="hz" excludeInvisibles="true">
       <relation target="" sidePair="right-right"/>
     </group>
+    <loader id="n7_sx2v" name="loaRarity" xy="168,13" size="40,85" group="n23_ofwu" aspect="true" url="ui://eg2y0ldpo9ghtli" fill="scaleMatchWidth"/>
+    <loader id="n16_qr4e" name="loaMainScore" xy="13,13" size="46,46" group="n23_ofwu" aspect="true" url="ui://eg2y0ldp842s6h" fill="scaleMatchHeight"/>
+    <image id="n15_dcro" name="n15" src="sx2v9t" fileName="imagesStory/zd_tctcdikugn_2.png" xy="3,2" group="n23_ofwu"/>
+    <loader id="n21_ofwu" name="loaBorder" xy="0,0" size="220,235" group="n23_ofwu" url="ui://eg2y0ldp94m19v" fill="scaleFree"/>
+    <graph id="n13_dcro" name="holder" xy="110,115" size="1,1" group="n23_ofwu" touchable="false" type="rect">
+      <gearDisplay controller="button" pages="1"/>
+    </graph>
+    <group id="n23_ofwu" name="n23" xy="0,0" size="220,282"/>
   </displayList>
   <Button mode="Radio"/>
 </component>

FGUIProject/assets/Main/package.xml

@@ -648,6 +648,8 @@
     <image id="t6j1ox" name="zd_shanghai_db.png" path="/imagesNew/"/>
     <image id="jt8doy" name="db_qipaokuang.png" path="/imagesNew/" scale="9grid" scale9grid="17,9,177,18"/>
     <image id="e050oz" name="jdt_shuangrenzd.png" path="/imagesNew/"/>
+    <component id="ofwup0" name="ListCardSkillItem.xml" path="/"/>
+    <component id="ofwup1" name="ListCardSkillItemMask.xml" path="/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ArenaDanUpUI.cs

@@ -8,10 +8,8 @@ namespace UI.Arena
     {
         public GComponent target;
         public Controller m_c1;
-        public GTextField m_txtlastDanTitle;
-        public GLoader m_loaLastDanIcon;
-        public GLoader m_loaDanIcon;
-        public GTextField m_txtDanTitle;
+        public UI_ComDanIcon m_comLastDan;
+        public UI_ComDanIcon m_comCurDan;
         public GList m_listFirstDanReward;
         public Transition m_t0;
         public const string URL = "ui://4lc5fhlbpsph8";
@@ -62,20 +60,18 @@ namespace UI.Arena
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
-            m_txtlastDanTitle = (GTextField)comp.GetChild("txtlastDanTitle");
-            m_loaLastDanIcon = (GLoader)comp.GetChild("loaLastDanIcon");
-            m_loaDanIcon = (GLoader)comp.GetChild("loaDanIcon");
-            m_txtDanTitle = (GTextField)comp.GetChild("txtDanTitle");
+            m_comLastDan = (UI_ComDanIcon)UI_ComDanIcon.Create(comp.GetChild("comLastDan"));
+            m_comCurDan = (UI_ComDanIcon)UI_ComDanIcon.Create(comp.GetChild("comCurDan"));
             m_listFirstDanReward = (GList)comp.GetChild("listFirstDanReward");
             m_t0 = comp.GetTransition("t0");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
-            m_txtlastDanTitle = null;
-            m_loaLastDanIcon = null;
-            m_loaDanIcon = null;
-            m_txtDanTitle = null;
+            m_comLastDan.Dispose();
+            m_comLastDan = null;
+            m_comCurDan.Dispose();
+            m_comCurDan = null;
             m_listFirstDanReward = null;
             m_t0 = null;
             if(disposeTarget && target != null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ComDanIcon.cs

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Arena
+{
+    public partial class UI_ComDanIcon
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GTextField m_txtDanTitle;
+        public GLoader m_loaDanIcon;
+        public const string URL = "ui://4lc5fhlbofwu5q";
+        public const string PACKAGE_NAME = "Arena";
+        public const string RES_NAME = "ComDanIcon";
+        private static UI_ComDanIcon _proxy;
+
+        public static UI_ComDanIcon Create(GObject gObject = null)
+        {
+            var ui = new UI_ComDanIcon();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ComDanIcon Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComDanIcon();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_c1 = comp.GetController("c1");
+            m_txtDanTitle = (GTextField)comp.GetChild("txtDanTitle");
+            m_loaDanIcon = (GLoader)comp.GetChild("loaDanIcon");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_txtDanTitle = null;
+            m_loaDanIcon = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ComDanIcon.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueChatUI.cs

@@ -0,0 +1,80 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.League
+{
+    public partial class UI_LeagueChatUI
+    {
+        public GComponent target;
+        public GLoader m_loaBg;
+        public GList m_list;
+        public GTextInput m_txtChat;
+        public GButton m_btnSend;
+        public const string URL = "ui://tw70qm9dofwu8d";
+        public const string PACKAGE_NAME = "League";
+        public const string RES_NAME = "LeagueChatUI";
+        private static UI_LeagueChatUI _proxy;
+
+        public static UI_LeagueChatUI Create(GObject gObject = null)
+        {
+            var ui = new UI_LeagueChatUI();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_LeagueChatUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_LeagueChatUI();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_list = (GList)comp.GetChild("list");
+            m_txtChat = (GTextInput)comp.GetChild("txtChat");
+            m_btnSend = (GButton)comp.GetChild("btnSend");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaBg = null;
+            m_list = null;
+            m_txtChat = null;
+            m_btnSend = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueChatUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueUI.cs

@@ -20,6 +20,7 @@ namespace UI.League
         public GButton m_btnChangeNotice;
         public GTextField m_txtLeaderName;
         public GTextField m_txtNotice;
+        public GButton m_btnChat;
         public UI_ButtonModle6 m_btnPray;
         public UI_ButtonModle2 m_btnSkill;
         public UI_ButtonModle3 m_btnGift;
@@ -86,6 +87,7 @@ namespace UI.League
             m_btnChangeNotice = (GButton)comp.GetChild("btnChangeNotice");
             m_txtLeaderName = (GTextField)comp.GetChild("txtLeaderName");
             m_txtNotice = (GTextField)comp.GetChild("txtNotice");
+            m_btnChat = (GButton)comp.GetChild("btnChat");
             m_btnPray = (UI_ButtonModle6)UI_ButtonModle6.Create(comp.GetChild("btnPray"));
             m_btnSkill = (UI_ButtonModle2)UI_ButtonModle2.Create(comp.GetChild("btnSkill"));
             m_btnGift = (UI_ButtonModle3)UI_ButtonModle3.Create(comp.GetChild("btnGift"));
@@ -111,6 +113,7 @@ namespace UI.League
             m_btnChangeNotice = null;
             m_txtLeaderName = null;
             m_txtNotice = null;
+            m_btnChat = null;
             m_btnPray.Dispose();
             m_btnPray = null;
             m_btnSkill.Dispose();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListChatAnswerItem.cs

@@ -0,0 +1,80 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.League
+{
+    public partial class UI_ListChatAnswerItem
+    {
+        public GComponent target;
+        public GComponent m_comHead;
+        public GTextField m_txtName;
+        public GLoader m_loaTitle;
+        public GTextField m_txtChatContent;
+        public const string URL = "ui://tw70qm9dpvb456";
+        public const string PACKAGE_NAME = "League";
+        public const string RES_NAME = "ListChatAnswerItem";
+        private static UI_ListChatAnswerItem _proxy;
+
+        public static UI_ListChatAnswerItem Create(GObject gObject = null)
+        {
+            var ui = new UI_ListChatAnswerItem();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ListChatAnswerItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ListChatAnswerItem();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_comHead = (GComponent)comp.GetChild("comHead");
+            m_txtName = (GTextField)comp.GetChild("txtName");
+            m_loaTitle = (GLoader)comp.GetChild("loaTitle");
+            m_txtChatContent = (GTextField)comp.GetChild("txtChatContent");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_comHead = null;
+            m_txtName = null;
+            m_loaTitle = null;
+            m_txtChatContent = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListChatAnswerItem.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListChatAnswerItemMine.cs

@@ -0,0 +1,80 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.League
+{
+    public partial class UI_ListChatAnswerItemMine
+    {
+        public GComponent target;
+        public GComponent m_comHead;
+        public GLoader m_loaTitle;
+        public GTextField m_txtName;
+        public GTextField m_txtChatContent;
+        public const string URL = "ui://tw70qm9dpvb457";
+        public const string PACKAGE_NAME = "League";
+        public const string RES_NAME = "ListChatAnswerItemMine";
+        private static UI_ListChatAnswerItemMine _proxy;
+
+        public static UI_ListChatAnswerItemMine Create(GObject gObject = null)
+        {
+            var ui = new UI_ListChatAnswerItemMine();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ListChatAnswerItemMine Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ListChatAnswerItemMine();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_comHead = (GComponent)comp.GetChild("comHead");
+            m_loaTitle = (GLoader)comp.GetChild("loaTitle");
+            m_txtName = (GTextField)comp.GetChild("txtName");
+            m_txtChatContent = (GTextField)comp.GetChild("txtChatContent");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_comHead = null;
+            m_loaTitle = null;
+            m_txtName = null;
+            m_txtChatContent = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListChatAnswerItemMine.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListChatItem.cs

@@ -11,7 +11,7 @@ namespace UI.League
         public GTextField m_txtName;
         public GLoader m_loaTitle;
         public GTextField m_txtChatContent;
-        public const string URL = "ui://tw70qm9dpvb456";
+        public const string URL = "ui://tw70qm9dofwu8e";
         public const string PACKAGE_NAME = "League";
         public const string RES_NAME = "ListChatItem";
         private static UI_ListChatItem _proxy;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListChatItemMine.cs

@@ -11,7 +11,7 @@ namespace UI.League
         public GLoader m_loaTitle;
         public GTextField m_txtName;
         public GTextField m_txtChatContent;
-        public const string URL = "ui://tw70qm9dpvb457";
+        public const string URL = "ui://tw70qm9dofwu8f";
         public const string PACKAGE_NAME = "League";
         public const string RES_NAME = "ListChatItemMine";
         private static UI_ListChatItemMine _proxy;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListSkillItem.cs

@@ -14,6 +14,7 @@ namespace UI.League
         public GImage m_imgLock;
         public GImage m_imgSuo;
         public GComponent m_comCost;
+        public GGraph m_holder;
         public const string URL = "ui://tw70qm9dpvb45d";
         public const string PACKAGE_NAME = "League";
         public const string RES_NAME = "ListSkillItem";
@@ -68,6 +69,7 @@ namespace UI.League
             m_imgLock = (GImage)comp.GetChild("imgLock");
             m_imgSuo = (GImage)comp.GetChild("imgSuo");
             m_comCost = (GComponent)comp.GetChild("comCost");
+            m_holder = (GGraph)comp.GetChild("holder");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -78,6 +80,7 @@ namespace UI.League
             m_imgLock = null;
             m_imgSuo = null;
             m_comCost = null;
+            m_holder = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -10,10 +10,11 @@ namespace UI.Main
         public UI_ComCardMask m_comCardMask;
         public GTextField m_txtName;
         public GTextField m_txtLv;
+        public GTextField m_txtStarLv;
         public GLoader m_loaRarity;
         public GLoader m_loaMainScore;
+        public GLoader m_loaBorder;
         public GGraph m_holder;
-        public GTextField m_txtStarLv;
         public const string URL = "ui://mfvz4q8kr1a99f";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "ListCardItem";
@@ -64,10 +65,11 @@ namespace UI.Main
             m_comCardMask = (UI_ComCardMask)UI_ComCardMask.Create(comp.GetChild("comCardMask"));
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_txtLv = (GTextField)comp.GetChild("txtLv");
+            m_txtStarLv = (GTextField)comp.GetChild("txtStarLv");
             m_loaRarity = (GLoader)comp.GetChild("loaRarity");
             m_loaMainScore = (GLoader)comp.GetChild("loaMainScore");
+            m_loaBorder = (GLoader)comp.GetChild("loaBorder");
             m_holder = (GGraph)comp.GetChild("holder");
-            m_txtStarLv = (GTextField)comp.GetChild("txtStarLv");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -75,10 +77,11 @@ namespace UI.Main
             m_comCardMask = null;
             m_txtName = null;
             m_txtLv = null;
+            m_txtStarLv = null;
             m_loaRarity = null;
             m_loaMainScore = null;
+            m_loaBorder = null;
             m_holder = null;
-            m_txtStarLv = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

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

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

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

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

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

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

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

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

@@ -9,11 +9,12 @@ namespace UI.Main
         public GComponent target;
         public GLoader m_loaScore;
         public GTextField m_txtName;
-        public GTextField m_txtDiscribe;
-        public GTextField m_txtTips;
         public GList m_listCard;
         public GButton m_btnCancel;
         public GButton m_btnConfirm;
+        public GButton m_btnUpCard;
+        public GList m_listSkill;
+        public GTextField m_txtTips;
         public const string URL = "ui://mfvz4q8kr1a99d";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "StoryCardChooseUI";
@@ -63,21 +64,23 @@ namespace UI.Main
         {
             m_loaScore = (GLoader)comp.GetChild("loaScore");
             m_txtName = (GTextField)comp.GetChild("txtName");
-            m_txtDiscribe = (GTextField)comp.GetChild("txtDiscribe");
-            m_txtTips = (GTextField)comp.GetChild("txtTips");
             m_listCard = (GList)comp.GetChild("listCard");
             m_btnCancel = (GButton)comp.GetChild("btnCancel");
             m_btnConfirm = (GButton)comp.GetChild("btnConfirm");
+            m_btnUpCard = (GButton)comp.GetChild("btnUpCard");
+            m_listSkill = (GList)comp.GetChild("listSkill");
+            m_txtTips = (GTextField)comp.GetChild("txtTips");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaScore = null;
             m_txtName = null;
-            m_txtDiscribe = null;
-            m_txtTips = null;
             m_listCard = null;
             m_btnCancel = null;
             m_btnConfirm = null;
+            m_btnUpCard = null;
+            m_listSkill = null;
+            m_txtTips = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/Utils/ResPathUtil.cs

@@ -135,7 +135,7 @@ namespace GFGGame
         {
             if(inAniDir)
             {
-                return $"{GetDressUpEffectDirPath(res)}/{res}2.{extName}";
+                return $"{GetDressUpEffectDirPath(res)}/{res}_2.{extName}";
             }
             return $"{GetDressUpEffectDirPath(res)}/{res}.{extName}";
         }

GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaDanUpView.cs

@@ -53,13 +53,13 @@ namespace GFGGame
             }
 
             cfg = ArenaRankCfgArray.Instance.GetCfg(curGrade);
-            _ui.m_txtDanTitle.text = cfg.gradeName;
-            ArenaViewManager.Instance.UpdateDanIcon(_ui.m_loaDanIcon, cfg.id);
+            _ui.m_comCurDan.m_txtDanTitle.text = cfg.gradeName;
+            ArenaViewManager.Instance.UpdateDanIcon(_ui.m_comCurDan.m_loaDanIcon, cfg.id);
 
 
             ArenaRankCfg lastCfg = ArenaRankCfgArray.Instance.GetCfg(lastGrade);
-            _ui.m_txtlastDanTitle.text = lastCfg.gradeName;
-            ArenaViewManager.Instance.UpdateDanIcon(_ui.m_loaLastDanIcon, lastCfg.id);
+            _ui.m_comLastDan.m_txtDanTitle.text = lastCfg.gradeName;
+            ArenaViewManager.Instance.UpdateDanIcon(_ui.m_comLastDan.m_loaDanIcon, lastCfg.id);
 
             _ui.m_t0.Play(() =>
             {

GameClient/Assets/Game/HotUpdate/Views/Card/CardDetailView.cs

@@ -102,7 +102,7 @@ namespace GFGGame
             RarityIconController.UpdateRarityIcon(listItem.m_loaRarity, data.itemCfg.id, false);// ResPathUtil.GetCommonGameResPath("kp_sxing_x_" + data.itemCfg.rarity);
             listItem.m_loaMainScore.url = ResPathUtil.GetCommonGameResPath("kp_sx_" + (data.itemCfg.mainScore));
 
-            listItem.m_loaBorder.url = "ui://Card/kp_kuang_" + data.itemCfg.rarity;//ResPathUtil.GetCommonGameResPath("kp_sxing_x_" + data.itemCfg.rarity);
+            listItem.m_loaBorder.url = "ui://CommonGame/kp_kuang_" + data.itemCfg.rarity;//ResPathUtil.GetCommonGameResPath("kp_sxing_x_" + data.itemCfg.rarity);
             listItem.m_txtLv.text = data.lv + "级";
             listItem.m_txtName.text = data.itemCfg.name;
             RedDotController.Instance.SetComRedDot(listItem.target, RedDotDataManager.Instance.GetCardSkillsRed(data.id) || RedDotDataManager.Instance.GetCardStarReward(data.id), "", 10, -4);

GameClient/Assets/Game/HotUpdate/Views/League/LeagueAnsweringView.cs

@@ -351,9 +351,9 @@ namespace GFGGame
         private string GetListChatItemResource(int index)
         {
             if (ChatDataManager.Instance.GetChatDatas(ChatType.LeagueQuestion)[index].RoleInfo.roleId == RoleDataManager.roleId)
-                return "ui://League/ListChatItemMine";
+                return "ui://League/ListChatAnswerItemMine";
             else
-                return "ui://League/ListChatItem";
+                return "ui://League/ListChatAnswerItem";
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/League/LeagueChatView.cs

@@ -0,0 +1,106 @@
+using ET;
+using FairyGUI;
+using UI.CommonGame;
+using UI.League;
+using UnityEngine;
+
+namespace GFGGame
+{
+    //联盟聊天
+    public class LeagueChatView : BaseWindow
+    {
+        private UI_LeagueChatUI _ui;
+
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_LeagueChatUI.PACKAGE_NAME;
+            _ui = UI_LeagueChatUI.Create();
+            this.viewCom = _ui.target;
+            isfullScreen = true;
+
+            _ui.m_loaBg.onClick.Add(Hide);
+            _ui.m_list.itemRenderer = RenderListItem;
+            _ui.m_list.itemProvider = GetListChatItemResource;
+            _ui.m_list.SetVirtual();
+
+            _ui.m_btnSend.onClick.Add(OnBtnSendClick);
+        }
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+            EventAgent.AddEventListener(ConstMessage.NOTICE_CHAT_MESSAGE, UpdateChatList);
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+            UpdateChatList();
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+            if (_ui.m_list.numItems > 0) _ui.m_list.ScrollToView(0);
+        }
+
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.NOTICE_CHAT_MESSAGE, UpdateChatList);
+        }
+        private void UpdateChatList()
+        {
+            _ui.m_list.numItems = ChatDataManager.Instance.GetChatDatas(ChatType.League).Count;
+            _ui.m_list.scrollPane.ScrollBottom(true);
+        }
+        private string GetListChatItemResource(int index)
+        {
+            if (ChatDataManager.Instance.GetChatDatas(ChatType.League)[index].RoleInfo.roleId == RoleDataManager.roleId)
+                return "ui://League/ListChatItemMine";
+            else
+                return "ui://League/ListChatItem";
+        }
+        private void RenderListItem(int index, GObject obj)
+        {
+            ChatData chatData = ChatDataManager.Instance.ChatDatas[ChatType.League][index];
+            OtherRoleInfoData roleInfo = chatData.RoleInfo;
+            UI_ListChatItem item = UI_ListChatItem.Proxy(obj);
+
+            RoleInfoManager.Instance.UpdateHeadWithLv(item.m_comHead, roleInfo.headId, roleInfo.headBorderId, roleInfo.roleLv);
+            item.m_txtName.text = roleInfo.roleName;
+            string content = "";
+            for (int i = 0; i < chatData.Content.Length; i++)
+            {
+                string str = i == 12 * (i + 1) ? chatData.Content[i] + "/n" : chatData.Content[i].ToString();
+                content += str;
+            }
+            item.m_txtChatContent.text = chatData.Content;
+
+            UI_ListChatItem.ProxyEnd();
+        }
+        private async void OnBtnSendClick()
+        {
+            if (string.IsNullOrEmpty(_ui.m_txtChat.text))
+            {
+                PromptController.Instance.ShowFloatTextPrompt("还没有输入想发送的内容哦");
+                return;
+            }
+            bool result = await ChatSProxy.ReqSendChatMsg(ChatType.League, _ui.m_txtChat.text);
+            if (result)
+            {
+                _ui.m_txtChat.text = "";
+                UpdateChatList();
+            }
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/League/LeagueChatView.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/League/LeaguePrayView.cs

@@ -101,7 +101,18 @@ namespace GFGGame
             long needCount = prayCfg.consumeArr[0][1];
             if (type == LeaguePrayType.First && curTimes != 0 && hasCount < needCount || type != LeaguePrayType.First && hasCount < needCount)
             {
-                PromptController.Instance.ShowFloatTextPrompt("消耗不足");
+                if (prayCfg.consumeArr[0][0] == ConstItemID.GOLD)
+                {
+                    ItemUtil.AddGold(0, null, 1);
+                }
+                else if (prayCfg.consumeArr[0][0] == ConstItemID.DIAMOND_RED)
+                {
+                    ItemUtil.AddDiamondRed();
+                }
+                else
+                {
+                    PromptController.Instance.ShowFloatTextPrompt("消耗不足");
+                }
                 return;
             }
             LeagueSproxy.ReqPrayLeague(type).Coroutine();

GameClient/Assets/Game/HotUpdate/Views/League/LeagueSkillUpView.cs

@@ -19,6 +19,8 @@ namespace GFGGame
         private GoWrapper _wrapper0;
         private GoWrapper _wrapper1;
         private GoWrapper _wrapper2;
+        private List<GameObject> _gameObjects = new List<GameObject>();
+        private List<GoWrapper> _wrappers = new List<GoWrapper>();
         private int _pageCount;
         private int _type;
         public override void Dispose()
@@ -26,6 +28,10 @@ namespace GFGGame
             SceneController.DestroyObjectFromView(_gameObject0, _wrapper0);
             SceneController.DestroyObjectFromView(_gameObject1, _wrapper1);
             SceneController.DestroyObjectFromView(_gameObject2, _wrapper2);
+            for (int i = 0; i < _gameObjects.Count; i++)
+            {
+                SceneController.DestroyObjectFromView(_gameObjects[i], _wrappers[i]);
+            }
             if (_valueBarController != null)
             {
                 _valueBarController.Dispose();
@@ -196,7 +202,33 @@ namespace GFGGame
                     break;
                 }
             }
+
             item.m_imgSuo.visible = !canActive;
+            item.m_holder.visible = isLock && canActive;
+            if (isLock && canActive)
+            {
+                GameObject gameObject;
+                GoWrapper wrapper;
+                if (_gameObjects.Count > index)
+                {
+                    gameObject = _gameObjects[index];
+                    wrapper = _wrappers[index];
+                }
+                string resPath = ResPathUtil.GetViewEffectPath("ui_league", "tea_nolearn");
+                SceneController.AddObjectToView(null, null, item.m_holder, resPath, out gameObject, out wrapper);
+
+                if (_gameObjects.Count <= index)
+                {
+                    _gameObjects.Add(gameObject);
+                    _wrappers.Add(wrapper);
+                }
+                else
+                {
+                    _gameObjects[index] = gameObject;
+                    _wrappers[index] = wrapper;
+                }
+            }
+
             ItemUtil.UpdateItemNeedNum(item.m_comCost, skillCfgs[index].consumeArr[0], false, "#FFFBF4");
             if (item.target.data == null)
             {

GameClient/Assets/Game/HotUpdate/Views/League/LeagueView.cs

@@ -40,6 +40,7 @@ namespace GFGGame
             _ui.m_btnGift.target.onClick.Add(OnBtnGiftClick);
             _ui.m_btnShop.target.onClick.Add(OnBtnShopClick);
             _ui.m_btnParty.target.onClick.Add(OnBtnPartyClick);
+            _ui.m_btnChat.onClick.Add(OnBtnChatClick);
         }
         protected override void AddEventListener()
         {
@@ -93,6 +94,10 @@ namespace GFGGame
         {
             ViewManager.Show<LeagueChangeNoticeView>(null, new object[] { typeof(LeagueView).FullName, null });
         }
+        private void OnBtnChatClick()
+        {
+            ViewManager.Show<LeagueChatView>();
+        }
         private void OnBtnPrayClick()
         {
             ViewManager.Show<LeaguePrayView>(null, new object[] { typeof(LeagueView).FullName, null });

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

@@ -46,8 +46,11 @@ namespace GFGGame
             _ui.m_listCard.itemRenderer = RenderListCardItem;
             _ui.m_listCard.onClickItem.Add(OnListCardItemClick);
 
+            _ui.m_listSkill.itemRenderer = RenderListSkillItem;
+
             _ui.m_btnCancel.onClick.Add(OnBtnCancelClick);
             _ui.m_btnConfirm.onClick.Add(OnBtnComfirmClick);
+            _ui.m_btnUpCard.onClick.Add(OnBtnUpCardClikc);
         }
         protected override void OnShown()
         {
@@ -75,16 +78,25 @@ namespace GFGGame
 
             int cardId = cardList[index].id;
             _ui.m_txtName.text = "";
-            _ui.m_txtDiscribe.text = "";
 
             PassivitySkillCfg cfg = ScoreSystemData.Instance.GetShowSkillCfg(cardId);
             if (cfg == null) return;
-            int skillId = ScoreSystemData.Instance.GetShowSkillCfg(cardId).skillId;
-            int skillLv = SkillDataManager.Instance.GetCardSkillLv(cardId, skillId);
-            PassivitySkillLvlCfg skillLvCfg = PassivitySkillLvlCfgArray.Instance.GetCfgByskilllvlAndskillId(skillLv, skillId);
             _ui.m_txtName.text = cfg.name;
-            _ui.m_txtDiscribe.text = skillLvCfg.describe;
+
+            List<PassivitySkillCfg> skillCfgs = PassivitySkillCfgArray.Instance.GetCfgsBycardId(cardId);
+            _ui.m_listSkill.data = skillCfgs;
+            _ui.m_listSkill.numItems = skillCfgs.Count;
+        }
+
+        private void RenderListSkillItem(int index, GObject obj)
+        {
+            List<PassivitySkillCfg> skillCfgs = obj.parent.data as List<PassivitySkillCfg>;
+            UI_ListCardSkillItem item = UI_ListCardSkillItem.Proxy(obj);
+            item.m_comSkill.m_loaSkill.url = ResPathUtil.GetCardSmallPath(skillCfgs[index].res);
+            item.m_txtLv.text = SkillDataManager.Instance.GetCardSkillLv(skillCfgs[index].cardId, skillCfgs[index].skillId).ToString();
+            UI_ListCardSkillItem.ProxyEnd();
         }
+
         private void RenderListCardItem(int index, GObject obj)
         {
             CardData cardData = cardList[index];
@@ -96,7 +108,7 @@ namespace GFGGame
             // item.m_loaRarity.url = ResPathUtil.GetCommonGameResPath("kp_sxing_x_" + cardData.itemCfg.rarity);
             RarityIconController.UpdateRarityIcon(item.m_loaRarity, cardData.itemCfg.id, false);// ResPathUtil.GetCommonGameResPath("kp_sxing_x_" + data.itemCfg.rarity);
             item.m_loaMainScore.url = ResPathUtil.GetCommonGameResPath("kp_sx_" + (cardData.itemCfg.mainScore));
-
+            item.m_loaBorder.url = "ui://CommonGame/kp_kuang_" + cardData.itemCfg.rarity;
             // UI_ComStar comStar = UI_ComStar.Proxy(item.m_comStar);
             item.m_txtStarLv.text = cardData.star.ToString();
             // comStar.m_c1.selectedIndex = cardData.star;
@@ -130,6 +142,11 @@ namespace GFGGame
                 EventAgent.DispatchEvent(ConstMessage.CARD_SELECTED);
             }
         }
+        private void OnBtnUpCardClikc()
+        {
+            ViewManager.Show<CardFosterView>(cardList[_ui.m_listCard.selectedIndex], new object[] { typeof(StoryCardChoose).FullName, _scoreType });
+            this.Hide();
+        }
         private void OnBtnComfirmClick()
         {
             int cardId = cardList[_ui.m_listCard.selectedIndex].id;