雅集

FGUIProject/assets/CommonGame/ItemExchangeUI.xml

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="962,970">
   <displayList>
-    <component id="n0_si5z" name="comBg" src="si5ztih" fileName="components/ComBg.xml" xy="0,-11" size="962,992" pkg="mk0fwx0x">
+    <component id="n0_si5z" name="comBg" src="si5ztih" fileName="components/ComBg.xml" pkg="mk0fwx0x" xy="0,-11" size="962,992">
       <relation target="" sidePair="height-height"/>
     </component>
     <text id="n5_si5z" name="txtName" xy="65,58" size="186,61" group="n12_si5z" fontSize="46" color="#8a7253" autoClearText="true" text="物品名字"/>
-    <text id="n6_si5z" name="txtOwned" xy="742,80" pivot="1,0" size="139,41" group="n12_si5z" fontSize="30" color="#90877f" vars="true" text="已拥有:{count=20}"/>
+    <text id="n6_si5z" name="txtOwned" xy="747,80" pivot="1,0" size="134,41" group="n12_si5z" fontSize="30" color="#90877f" vars="true" text="已拥有:{count=20}"/>
     <image id="n7_si5z" name="n7" src="si5ztig" fileName="imgnew/tc_xiant.png" xy="56,130" group="n12_si5z"/>
     <loader id="n8_si5z" name="loaRarity" xy="40,164" size="44,94" group="n12_si5z" url="ui://eg2y0ldpd4iw4z" autoSize="true"/>
     <loader id="n9_si5z" name="loaIcon" xy="165,253" pivot="0.5,0.5" anchor="true" size="200,200" group="n12_si5z" aspect="true" autoSize="true"/>
     <image id="n10_si5z" name="n10" src="r9ritjl" fileName="imgnew/tc_kuangk.png" xy="357,167" group="n12_si5z"/>
     <text id="n11_si5z" name="txtDesc" xy="375,189" size="506,166" group="n12_si5z" fontSize="30" color="#998a79" ubb="true" autoSize="none" autoClearText="true" text="手机课程很快就要开课咯！！同学们有没有很期待哇过 几天课上见昂！！28节课希望大家都可以跟下来一起度 过有趣儿的两个月吧。"/>
-    <text id="n28_s5s9" name="txtExchangeCount" xy="230,314" pivot="1,0" size="69,49" group="n12_si5z" fontSize="36" color="#fbf6eb" vars="true" strokeColor="#5c4e3f" strokeSize="2" text="x{count=20}"/>
+    <text id="n28_s5s9" name="txtExchangeCount" xy="237,314" pivot="1,0" size="62,49" group="n12_si5z" fontSize="36" color="#fbf6eb" vars="true" strokeColor="#5c4e3f" strokeSize="2" text="x{count=20}"/>
     <group id="n12_si5z" name="n12" xy="40,58" size="866,313"/>
     <image id="n2_si5z" name="n2" src="si5zti8" fileName="imgnew/tc_zszs.png" xy="32,445" size="897,15" group="n4_si5z"/>
     <text id="n3_si5z" name="txtShow" xy="359,423" size="244,54" group="n4_si5z" fontSize="40" color="#8a7253" text="选择使用数量"/>
@@ -24,11 +24,11 @@
     <component id="n18_si5z" name="btnMax" src="si5ztio" fileName="components/Button3.xml" xy="597,527" group="n19_si5z">
       <Button icon="ui://eg2y0ldpsi5ztil"/>
     </component>
-    <text id="n22_si5z" name="txtCostCount" xy="338,535" pivot="0.5,0" size="54,54" group="n19_si5z" fontSize="40" color="#816e57" text="50"/>
+    <text id="n22_si5z" name="txtCostCount" xy="341,535" pivot="0.5,0" size="48,54" group="n19_si5z" fontSize="40" color="#816e57" text="50"/>
     <group id="n19_si5z" name="n19" xy="175,527" size="612,70"/>
-    <text id="n24_si5z" name="txtTips" xy="317,648" pivot="0.5,0" size="328,51" group="n26_si5z" fontSize="38" color="#8e7c6b" align="center" text="是否使用1个道具？"/>
-    <component id="n25_si5z" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" xy="359,739" pivot="0.5,0" group="n26_si5z"/>
-    <group id="n26_si5z" name="n26" xy="317,648" size="328,137" advanced="true" layout="vt" lineGap="40" excludeInvisibles="true"/>
+    <text id="n24_si5z" name="txtTips" xy="318,648" pivot="0.5,0" size="326,51" group="n26_si5z" fontSize="38" color="#8e7c6b" align="center" text="是否使用1个道具？"/>
+    <component id="n25_si5z" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" xy="416,739" pivot="0.5,0" group="n26_si5z" controller="c1,0"/>
+    <group id="n26_si5z" name="n26" xy="318,648" size="326,137" advanced="true" layout="vt" lineGap="40" excludeInvisibles="true"/>
     <component id="n14_si5z" name="btnCancle" src="si5ztim" fileName="components/Button1.xml" xy="124,827" group="n20_si5z">
       <Button icon="ui://eg2y0ldps5s9tim"/>
     </component>

FGUIProject/assets/League/LeagueAnswerRankUI.xml

@@ -7,7 +7,7 @@
   <displayList>
     <image id="n0_pvb4" name="n0" src="a0cf2e" fileName="images/lm_db.png" xy="0,16" size="1080,1147"/>
     <component id="n1_pvb4" name="btnClose" src="a0cftl2" fileName="components/BtnClose.xml" pkg="eg2y0ldp" xy="905,36" size="111,96"/>
-    <image id="n6_pvb4" name="n6" src="wm603l" fileName="images/biaotizi_5.png" xy="202,96" size="673,62"/>
+    <image id="n6_pvb4" name="n6" src="9jv65j" fileName="images/biaotizi12.png" xy="203,96" size="673,62"/>
     <image id="n2_pvb4" name="n2" src="wm603d" fileName="images/lm_yeqian_db.png" xy="167,188" size="293,56" group="n5_pvb4"/>
     <component id="n3_pvb4" name="n3" src="rv091j" fileName="components/Button8.xml" xy="162,185" group="n5_pvb4">
       <Button checked="true" title="本周排行" controller="c1" page="1"/>
@@ -16,13 +16,13 @@
       <Button title="上周排行" controller="c1" page="2"/>
     </component>
     <group id="n5_pvb4" name="n5" xy="162,185" size="304,63"/>
-    <list id="n11_pvb4" name="list" xy="167,261" size="779,493" overflow="scroll" defaultItem="ui://tw70qm9dpvb451" autoClearItems="true">
+    <list id="n11_pvb4" name="list" xy="85,260" size="897,496" overflow="scroll" defaultItem="ui://tw70qm9dpvb451" autoClearItems="true">
       <gearDisplay controller="c1" pages="1,2"/>
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
-    <component id="n25_pvb4" name="comMine" src="pvb451" fileName="components/ListRankItem.xml" xy="164,810"/>
+    <component id="n25_pvb4" name="comMine" src="pvb451" fileName="components/ListRankItem.xml" xy="95,793" controller="c2,1"/>
   </displayList>
 </component>

FGUIProject/assets/League/LeagueAnswerRewardUI.xml

@@ -1,25 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1100">
+<component size="1080,647">
   <controller name="c1" pages="0,,1," selected="1"/>
   <displayList>
-    <image id="n0_pvb4" name="n0" src="a0cf2e" fileName="images/lm_db.png" xy="0,16" size="1080,1147"/>
-    <component id="n1_pvb4" name="btnClose" src="a0cftl2" fileName="components/BtnClose.xml" pkg="eg2y0ldp" xy="905,36" size="111,96"/>
-    <image id="n6_pvb4" name="n6" src="wm603l" fileName="images/biaotizi_5.png" xy="202,96" size="673,62"/>
-    <image id="n2_pvb4" name="n2" src="wm603d" fileName="images/lm_yeqian_db.png" xy="167,188" size="293,56" group="n5_pvb4"/>
-    <component id="n3_pvb4" name="n3" src="rv091j" fileName="components/Button8.xml" xy="162,185" group="n5_pvb4">
+    <image id="n0_pvb4" name="n0" src="o9gh40" fileName="images/tanchuang.png" xy="0,0"/>
+    <component id="n1_pvb4" name="btnClose" src="a0cftl2" fileName="components/BtnClose.xml" pkg="eg2y0ldp" xy="895,25" size="111,96"/>
+    <image id="n6_pvb4" name="n6" src="9jv66i" fileName="images/lm_biaotizi_13.png" xy="260,96"/>
+    <image id="n2_pvb4" name="n2" src="wm603d" fileName="images/lm_yeqian_db.png" xy="143,153" size="293,56" group="n5_pvb4"/>
+    <component id="n3_pvb4" name="n3" src="rv091j" fileName="components/Button8.xml" xy="138,150" group="n5_pvb4">
       <Button title="活动规则" controller="c1" page="0"/>
     </component>
-    <component id="n4_pvb4" name="n4" src="rv091j" fileName="components/Button8.xml" xy="314,185" group="n5_pvb4">
+    <component id="n4_pvb4" name="n4" src="rv091j" fileName="components/Button8.xml" xy="290,150" group="n5_pvb4">
       <Button checked="true" title="活动奖励" controller="c1" page="1"/>
     </component>
-    <group id="n5_pvb4" name="n5" xy="162,185" size="304,63"/>
-    <component id="n8_pvb4" name="btnRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="635,109" size="36,37">
-      <Button icon="ui://tw70qm9do9gh4b"/>
-    </component>
-    <text id="n18_pvb4" name="txtRule" xy="169,262" size="778,491" fontSize="30" align="center" autoSize="none" text="">
+    <group id="n5_pvb4" name="n5" xy="138,150" size="304,63"/>
+    <list id="n19_9jv6" name="listRule" xy="160,240" size="780,311" overflow="scroll" defaultItem="ui://tw70qm9d9jv67b">
       <gearDisplay controller="c1" pages="0"/>
-    </text>
-    <list id="n11_pvb4" name="list" xy="167,261" size="779,493" overflow="scroll" defaultItem="ui://tw70qm9dpvb459" align="center" autoClearItems="true">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <list id="n11_pvb4" name="list" xy="170,235" size="779,318" overflow="scroll" defaultItem="ui://tw70qm9dpvb459" align="center" autoClearItems="true">
       <gearDisplay controller="c1" pages="1"/>
       <item/>
       <item/>

FGUIProject/assets/League/LeagueAnswerUI.xml

@@ -1,17 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="900,589">
+<component size="1080,647">
   <displayList>
-    <component id="n3_pvb4" name="btnRank" src="rv091p" fileName="components/Button12.xml" xy="669,39" group="n7_pvb4">
+    <image id="n8_9jv6" name="n8" src="o9gh40" fileName="images/tanchuang.png" xy="0,0"/>
+    <image id="n17_9jv6" name="n17" src="a0cf2u" fileName="images/lm_zhuangshixian.png" xy="74,491"/>
+    <component id="n3_pvb4" name="btnRank" src="9jv67a" fileName="components/Button122.xml" xy="922,415">
       <Button title="排行榜"/>
     </component>
-    <component id="n0_pvb4" name="comHead" src="o9ghtlp" fileName="components/ComHeadWithLv2.xml" pkg="eg2y0ldp" xy="21,82" group="n7_pvb4"/>
-    <text id="n1_pvb4" name="n1" xy="50,334" size="152,41" group="n7_pvb4" fontSize="30" text="上周大聪明"/>
-    <text id="n2_pvb4" name="txtName" xy="17,392" pivot="0.5,0" size="211,41" group="n7_pvb4" fontSize="30" align="center" text="玩家名字七个字"/>
-    <text id="n6_pvb4" name="txtRule" xy="305,141" size="542,296" group="n7_pvb4" fontSize="30" align="center" autoSize="none" text=""/>
-    <text id="n4_pvb4" name="txtTime" xy="401,496" pivot="0.5,0" size="40,42" group="n7_pvb4" fontSize="30" align="center" text=""/>
-    <component id="n5_pvb4" name="btnAnswer" src="wm603x" fileName="components/Button111.xml" xy="256,481" group="n7_pvb4">
+    <component id="n11_9jv6" name="comHead" src="wm603r" fileName="components/ComHeadIcon.xml" xy="263,297" pivot="0.5,0.5" anchor="true" size="167,166" group="n13_9jv6" aspect="true" scale="1.125,1.125">
+      <relation target="" sidePair="width-width,height-height"/>
+    </component>
+    <image id="n12_9jv6" name="n12" src="wm6037" fileName="images/lm_db_touxiang.png" xy="106,113" group="n13_9jv6"/>
+    <image id="n14_9jv6" name="n14" src="9jv66m" fileName="images/lm_ch_dcm.png" xy="121,69" group="n13_9jv6"/>
+    <text id="n2_pvb4" name="txtName" xy="173,417" pivot="0.5,0" size="172,34" group="n13_9jv6" font="ui://eg2y0ldpa0cftks" fontSize="24" color="#915e15" align="center" text="玩家名字七个字"/>
+    <group id="n13_9jv6" name="n13" xy="106,69" size="316,401"/>
+    <text id="n6_pvb4" name="txtRule" xy="437,223" size="529,233" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#a9733e" autoSize="none" text="1.玩法描述玩法描述玩法描述玩法描述&#xA;2.玩法描述玩法描述玩法描述"/>
+    <text id="n4_pvb4" name="txtTime" xy="458,497" pivot="0.5,0" size="163,35" font="ui://eg2y0ldpa0cftks" fontSize="25" color="#716660" align="center" text="23:59:59后开启"/>
+    <component id="n5_pvb4" name="btnAnswer" src="pvb454" fileName="components/Button121.xml" xy="446,530">
       <Button title="开始答题"/>
     </component>
-    <group id="n7_pvb4" name="n7" xy="17,39" size="839,519"/>
+    <component id="n9_9jv6" name="n9" src="a0cftl2" fileName="components/BtnClose.xml" pkg="eg2y0ldp" xy="899,26"/>
+    <text id="n15_9jv6" name="n15" xy="439,172" size="132,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#a9733e" text="玩法描述"/>
+    <image id="n16_9jv6" name="n16" src="9jv663" fileName="images/lm_zhuangshixian_2.png" xy="360,217"/>
   </displayList>
 </component>

FGUIProject/assets/League/LeagueAnsweringUI.xml

@@ -1,85 +1,124 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
-  <controller name="ctrlHasIcon" pages="0,,1," selected="0">
+  <controller name="ctrlHasIcon" pages="0,,1," selected="1">
     <remark page="0" value="有图标"/>
     <remark page="1" value="无图标"/>
   </controller>
-  <controller name="ctrlQuestionState" pages="0,,1," selected="0">
+  <controller name="ctrlQuestionState" pages="0,,1," selected="1">
     <remark page="0" value="答题中"/>
     <remark page="1" value="cd中"/>
   </controller>
-  <controller name="ctrlQuestionType" pages="0,,1,,2," selected="1">
+  <controller name="ctrlQuestionType" pages="0,,1,,2," selected="2">
     <remark page="1" value="选择题"/>
     <remark page="2" value="填空题"/>
   </controller>
+  <controller name="ctrlResult" pages="0,,1,,2,,3," selected="2">
+    <remark page="1" value="有人答对题目"/>
+    <remark page="2" value="没人答对题目"/>
+    <remark page="3" value="全部题目答完"/>
+  </controller>
   <displayList>
     <loader id="n4_pvb4" 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>
+    <image id="n37_9jv6" name="n37" src="9jv66s" fileName="images/lm_dt_db.png" xy="0,0">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <image id="n45_9jv6" name="n45" src="9jv66q" fileName="images/lm_dt_cy_db.png" xy="25,724">
+      <relation target="" sidePair="height-height"/>
+    </image>
+    <image id="n38_9jv6" name="n38" src="9jv66o" fileName="images/lm_djs_db.png" xy="935,0"/>
     <component id="n5_pvb4" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80">
       <relation target="" sidePair="left-left,top-top"/>
     </component>
-    <text id="n7_pvb4" name="txtTime" xy="397,144" pivot="0.5,0" size="285,41" fontSize="30" align="center" text="活动剩余时间：00:00"/>
-    <component id="n8_pvb4" name="btnRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="715,140" size="36,37">
+    <text id="n7_pvb4" name="txtTime" xy="706,713" size="298,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#ceb188" text="活动剩余时间：00:00"/>
+    <component id="n8_pvb4" name="btnRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="663,718" size="36,37">
       <Button icon="ui://tw70qm9do9gh4b"/>
     </component>
-    <text id="n10_pvb4" name="txtRightCount" xy="698,241" size="214,41" fontSize="30" align="center" text="全员已答对10题"/>
-    <text id="n9_pvb4" name="txtAnswerTime" xy="501,242" pivot="0.5,0" size="78,41" group="n15_pvb4" fontSize="30" align="center" text="00:55"/>
-    <text id="n11_pvb4" name="txtAnswerNum" xy="479,288" pivot="0.5,0" size="121,41" group="n15_pvb4" fontSize="30" align="center" text="第1/15题"/>
-    <loader id="n12_pvb4" name="loaIocn" xy="231,347" pivot="0.5,0.5" size="134,134" group="n15_pvb4" aspect="true" url="ui://eg2y0ldpm9wm8v" fill="scale">
-      <gearDisplay controller="ctrlHasIcon" pages="0"/>
-    </loader>
-    <text id="n13_pvb4" name="txtContent" xy="407,347" pivot="0.5,0" size="425,142" group="n15_pvb4" fontSize="30" align="center" autoSize="none" text="">
-      <gearXY controller="ctrlHasIcon" pages="1" values="282,347" default="407,347"/>
-      <gearSize controller="ctrlHasIcon" pages="1" values="515,142,1,1" default="425,142,1,1"/>
+    <text id="n10_pvb4" name="txtRightCount" xy="435,128" size="210,42" font="ui://eg2y0ldpa0cftks" fontSize="30" color="#915e15" align="center" text="全员已答对10题"/>
+    <text id="n9_pvb4" name="txtAnswerTime" xy="959,165" pivot="0.5,0" size="74,44" group="n15_pvb4" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#fffdf8" align="center" text="00:55"/>
+    <text id="n11_pvb4" name="txtAnswerNum" xy="478,124" pivot="0.5,0" size="124,41" group="n15_pvb4" font="ui://eg2y0ldpa0cftkz" fontSize="30" color="#8b3510" align="center" text="第1/15题"/>
+    <text id="n13_pvb4" name="txtContent" xy="230,274" size="620,142" group="n15_pvb4" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#915e15" letterSpacing="-2" autoSize="none" text="题目描述题目描述题目描述题目描述题目 描述题目描述题目描述题目描述题目题目 描述述?">
+      <gearXY controller="ctrlHasIcon" pages="0,1" values="358,274|230,274"/>
+      <gearSize controller="ctrlHasIcon" pages="0,1" values="620,173,1,1|620,142,1,1"/>
     </text>
-    <list id="n14_pvb4" name="listResult" xy="407,544" pivot="0.5,0" size="449,148" group="n15_pvb4" layout="flow_hz" lineGap="10" lineItemCount="2" defaultItem="ui://tw70qm9dpvb454" autoItemSize="true" align="center" vAlign="middle" autoClearItems="true">
+    <list id="n14_pvb4" name="listResult" xy="227,515" pivot="0.5,0" size="625,148" group="n15_pvb4" layout="flow_hz" lineGap="20" lineItemCount="2" defaultItem="ui://tw70qm9d9jv67c" autoItemSize="true" align="center" vAlign="middle" autoClearItems="true">
       <gearDisplay controller="ctrlQuestionType" pages="1"/>
-      <gearXY controller="ctrlHasIcon" pages="0,1" values="407,544|253,544"/>
-      <gearSize controller="ctrlHasIcon" pages="1" values="573,148,1,1" default="449,148,1,1"/>
+      <gearXY controller="ctrlHasIcon" pages="0,1" values="359,515|227,515"/>
+      <gearSize controller="ctrlHasIcon" pages="0,1" values="625,148,1,1|625,148,1,1"/>
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
-    <text id="n16_pvb4" name="n16" xy="406,507" size="241,41" group="n19_pvb4" fontSize="30" align="center" text="请选择您的答案：">
+    <text id="n16_pvb4" name="n16" xy="229,472" size="241,41" group="n19_pvb4" font="ui://eg2y0ldpa0cftks" fontSize="30" color="#b68f52" align="center" text="请输入您的答案：">
       <gearText controller="ctrlQuestionType" pages="1,2" values="请选择您的答案：|请输入您的答案：" default="请填入您的答案："/>
     </text>
-    <text id="n17_pvb4" name="txtResult" xy="648,505" size="123,42" group="n19_pvb4" fontSize="30" align="center" autoSize="none" text="" input="true"/>
-    <text id="n18_pvb4" name="n18" xy="649,505" size="124,42" group="n19_pvb4" fontSize="30" align="center" autoSize="none" underline="true" text="                       ">
+    <text id="n17_pvb4" name="txtResult" xy="471,470" size="123,42" group="n19_pvb4" fontSize="30" color="#b68f52" align="center" autoSize="none" text="" input="true"/>
+    <text id="n18_pvb4" name="n18" xy="472,470" size="124,42" group="n19_pvb4" fontSize="30" color="#b68f52" align="center" autoSize="none" underline="true" text="                       ">
       <gearDisplay controller="ctrlQuestionType" pages="2"/>
     </text>
-    <group id="n19_pvb4" name="n19" xy="406,505" size="367,43" group="n15_pvb4" advanced="true">
+    <group id="n19_pvb4" name="n19" xy="229,470" size="367,43" group="n15_pvb4" advanced="true">
       <gearDisplay controller="ctrlQuestionType" pages=""/>
-      <gearXY controller="ctrlHasIcon" pages="0,1" values="406,505|282,505"/>
+      <gearXY controller="ctrlHasIcon" pages="0,1" values="360,470|229,470"/>
+    </group>
+    <image id="n41_9jv6" name="n41" src="9jv65k" fileName="images/lm_dt_tsdb.png" xy="15,664" group="n42_9jv6"/>
+    <text id="n40_9jv6" name="txtRightCount1" xy="58,667" size="196,41" group="n42_9jv6" font="ui://eg2y0ldpa0cftks" fontSize="30" color="#915e15" align="center" letterSpacing="-2" text="全员已答对10题"/>
+    <group id="n42_9jv6" name="n42" xy="15,664" size="290,87" group="n15_pvb4"/>
+    <image id="n43_9jv6" name="n43" src="9jv66w" fileName="images/lm_dt_icon_db.png" xy="68,252" group="n44_9jv6"/>
+    <loader id="n12_pvb4" name="loaIocn" xy="67,254" pivot="0.5,0.5" size="280,280" group="n44_9jv6" aspect="true" url="ui://eg2y0ldpm9wm8v" fill="scale"/>
+    <group id="n44_9jv6" name="n44" xy="67,252" size="292,283" group="n15_pvb4" advanced="true">
+      <gearDisplay controller="ctrlHasIcon" pages="0"/>
     </group>
-    <group id="n15_pvb4" name="n15" xy="231,242" size="625,450" advanced="true">
+    <group id="n15_pvb4" name="n15" xy="15,124" size="1018,627" advanced="true">
       <gearDisplay controller="ctrlQuestionState" pages="0"/>
     </group>
-    <component id="n20_pvb4" name="comRightHead" src="o9ghtlp" fileName="components/ComHeadWithLv2.xml" pkg="eg2y0ldp" xy="435,239" group="n24_pvb4"/>
-    <image id="n21_pvb4" name="imgFail" src="u2u3tkq" fileName="imgItemIcon/testBig.png" pkg="eg2y0ldp" xy="484,298" group="n24_pvb4"/>
-    <text id="n22_pvb4" name="txtInfo" xy="520,469" pivot="0.5,0" size="40,42" group="n24_pvb4" fontSize="30" align="center" underline="true" text=""/>
-    <text id="n23_pvb4" name="txtCdTime" xy="520,517" pivot="0.5,0" size="40,42" group="n24_pvb4" fontSize="30" align="center" underline="true" text=""/>
-    <group id="n24_pvb4" name="n24" xy="435,239" size="230,320" advanced="true">
+    <component id="n50_miy3" name="comRightHead" src="wm603r" fileName="components/ComHeadIcon.xml" xy="539,369" pivot="0.5,0.5" anchor="true" size="167,166" group="n52_miy3" aspect="true" scale="1.125,1.125">
+      <relation target="" sidePair="width-width,height-height"/>
+    </component>
+    <image id="n51_miy3" name="n51" src="wm6037" fileName="images/lm_db_touxiang.png" xy="382,185" group="n52_miy3"/>
+    <group id="n52_miy3" name="n52" xy="382,185" size="316,355" group="n24_pvb4" advanced="true">
+      <gearDisplay controller="ctrlResult" pages="1"/>
+    </group>
+    <image id="n21_pvb4" name="imgFail" src="9jv66a" fileName="images/fannao.png" xy="394,169" group="n24_pvb4">
+      <gearDisplay controller="ctrlResult" pages="2"/>
+    </image>
+    <image id="n55_miy3" name="n55" src="9jv65l" fileName="images/lm_dt_tsdk.png" xy="162,424" group="n24_pvb4">
+      <gearDisplay controller="ctrlResult" pages="3"/>
+    </image>
+    <text id="n22_pvb4" name="txtInfo" xy="305,514" pivot="0.5,0" size="469,44" group="n24_pvb4" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#915e15" align="center" text="哎呀，没人答对呀，大家加油鸭~">
+      <gearDisplay controller="ctrlResult" pages=""/>
+      <gearXY controller="ctrlResult" pages="3" values="305,417" default="305,514"/>
+    </text>
+    <image id="n53_miy3" name="n53" src="9jv65l" fileName="images/lm_dt_tsdk.png" xy="162,568" group="n54_miy3"/>
+    <text id="n23_pvb4" name="txtCdTime" xy="426,562" pivot="0.5,0" size="228,44" group="n54_miy3" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#915e15" align="center" text="秒后开始下一题"/>
+    <group id="n54_miy3" name="n54" xy="162,562" size="756,44" group="n24_pvb4" advanced="true">
+      <gearDisplay controller="ctrlResult" pages="1,2"/>
+    </group>
+    <group id="n24_pvb4" name="n24" xy="162,169" size="756,437" advanced="true">
       <gearDisplay controller="ctrlQuestionState" pages="1"/>
     </group>
-    <text id="n25_pvb4" name="txtJoinNum" xy="55,735" pivot="0.5,0" size="269,41" fontSize="30" align="center" text="当前参与成员：0/30"/>
-    <list id="n26_pvb4" name="listJoin" xy="42,808" size="300,865" overflow="scroll" defaultItem="ui://tw70qm9dpvb455" autoClearItems="true">
+    <text id="n25_pvb4" name="txtJoinNum" xy="73,738" pivot="0.5,0" size="233,39" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#927346" align="center" letterSpacing="-2" text="当前参与成员：0/30"/>
+    <list id="n26_pvb4" name="listJoin" xy="42,793" size="307,870" overflow="scroll" defaultItem="ui://tw70qm9dpvb455" autoClearItems="true">
+      <relation target="" sidePair="bottomext-bottom"/>
       <item/>
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
-    <list id="n30_pvb4" name="listChat" xy="366,813" size="664,862" overflow="scroll" defaultItem="ui://tw70qm9dpvb456" autoClearItems="true">
+    <list id="n30_pvb4" name="listChat" xy="366,794" size="664,869" overflow="scroll" defaultItem="ui://tw70qm9dpvb456" autoClearItems="true">
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
-    <text id="n35_pvb4" name="txtChat" xy="161,1701" size="558,60" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#915e15" letterSpacing="-2" vars="true" autoSize="none" text="" input="true" prompt="[color=#A89067]最多输入50个字[/color]" maxLength="50"/>
-    <component id="n36_pvb4" name="btnSend" src="rv091o" fileName="components/Button11.xml" xy="737,1701">
+    <image id="n47_9jv6" name="n47" src="9jv667" fileName="images/lm_dt_srdb.png" xy="0,1665"/>
+    <image id="n48_9jv6" name="n48" src="a0cf2g" fileName="images/lm_sousuok.png" xy="84,1779"/>
+    <text id="n35_pvb4" name="txtChat" xy="110,1784" size="558,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#b4905d" letterSpacing="-2" vars="true" autoSize="height" text="" input="true" prompt="[color=#A7957E]最多输入50个字[/color]" maxLength="50"/>
+    <component id="n36_pvb4" name="btnSend" src="rv091o" fileName="components/Button11.xml" xy="799,1775" size="198,61">
       <Button title="发送"/>
     </component>
+    <image id="n39_9jv6" name="n39" src="9jv66j" fileName="images/lm_zsx0.png" xy="170,128"/>
   </displayList>
 </component>

FGUIProject/assets/League/ListAnswerRuleItem.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="778,47">
+  <displayList>
+    <graph id="n20_9jv6" name="n20" xy="19,26" size="1,21" type="rect" lineSize="0" fillColor="#fff2e8e4">
+      <relation target="n18_pvb4" sidePair="height-height"/>
+    </graph>
+    <image id="n19_9jv6" name="n19" src="9jv664" fileName="images/lm_zsd.png" xy="10,11"/>
+    <text id="n18_pvb4" name="txtRule" xy="45,1" size="733,39" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#a9733e" ubb="true" autoSize="height" text="每天 开启雅集夜宴"/>
+  </displayList>
+  <relation target="n18_pvb4" sidePair="height-height"/>
+</component>

FGUIProject/assets/League/components/Button11.xml

@@ -2,11 +2,12 @@
 <component size="219,61" extention="Button">
   <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="219,61" aspect="true" url="ui://tw70qm9da0cf2o" fill="scale" autoSize="true"/>
+    <image id="n5_9jv6" name="n5" src="a0cf2o" fileName="images/lm_an_yellow.png" xy="0,0">
+      <relation target="" sidePair="width-width"/>
+    </image>
     <text id="n3_u2u3" name="title" xy="87,11" pivot="0.5,0" size="44,39" font="ui://eg2y0ldpa0cftky" fontSize="28" color="#683c28" align="center" vars="true" text="{value=0}/{maxValue=0}">
-      <relation target="" sidePair="middle-middle,left-right"/>
+      <relation target="" sidePair="center-center,middle-middle"/>
     </text>
   </displayList>
   <Button/>
-  <relation target="n4_u2u3" sidePair="width-width,height-height"/>
 </component>

FGUIProject/assets/League/components/Button122.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="62,75" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n0_9jv6" name="n0" src="9jv65w" fileName="images/lm_tb_phb.png" xy="0,0"/>
+    <text id="n1_9jv6" name="title" xy="-4,42" size="71,33" font="ui://eg2y0ldpa0cftks" fontSize="23" color="#915e15" align="center" vAlign="middle" singleLine="true" text="排行榜"/>
+  </displayList>
+  <Button/>
+</component>

FGUIProject/assets/League/components/Button123.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="330,61" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="1"/>
+  <controller name="c1" pages="0,,1," selected="0">
+    <remark page="0" value="错误"/>
+    <remark page="1" value="正确"/>
+  </controller>
+  <displayList>
+    <loader id="n2_9jv6" name="icon" xy="0,0" size="330,61" url="ui://tw70qm9d9jv66p" autoSize="true">
+      <gearIcon controller="c1" pages="0" values="ui://tw70qm9d9jv66p" default="ui://tw70qm9d9jv668"/>
+    </loader>
+    <text id="n1_9jv6" name="title" xy="34,9" size="150,42" font="ui://eg2y0ldpa0cftks" fontSize="30" color="#7982be" align="center" vAlign="middle" singleLine="true" text="A.答案文字">
+      <gearColor controller="c1" pages="1" values="#b68f52,#000000" default="#7982be,#000000"/>
+    </text>
+    <image id="n3_9jv6" name="n3" src="9jv665" fileName="images/lm_dt_tb_x.png" xy="203,0">
+      <gearDisplay controller="c1" pages="0"/>
+    </image>
+  </displayList>
+  <Button mode="Radio"/>
+</component>

FGUIProject/assets/League/components/ListAnswerJoinItem.xml

@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="299,104">
+<component size="337,110">
   <displayList>
-    <component id="n27_pvb4" name="comHead" src="o9ghtlo" fileName="components/ComHead1.xml" pkg="eg2y0ldp" xy="-63,-60" pivot="0.5,0.5" size="230,230" scale="0.5,0.5"/>
-    <text id="n28_pvb4" name="txtName" xy="119,8" size="172,34" fontSize="24" align="center" text="玩家名字七个字"/>
-    <text id="n29_pvb4" name="txtAnswerCount" xy="117,55" size="40,42" fontSize="30" align="center" text=""/>
+    <image id="n31_9jv6" name="n31" src="9jv66r" fileName="images/lm_dt_cy_dk.png" xy="71,12" group="n32_9jv6"/>
+    <component id="n27_pvb4" name="comHead" src="o9ghtlq" fileName="components/ComHead2.xml" pkg="eg2y0ldp" xy="-56,-64" pivot="0.5,0.5" size="230,230" group="n32_9jv6" scale="0.55,0.55"/>
+    <text id="n28_pvb4" name="txtName" xy="112,16" size="166,35" group="n32_9jv6" font="ui://eg2y0ldpa0cftks" fontSize="25" color="#923c1a" align="center" letterSpacing="-2" text="玩家名字七个字"/>
+    <text id="n29_pvb4" name="n29" xy="113,54" size="99,33" group="n32_9jv6" font="ui://eg2y0ldpa0cftks" fontSize="23" color="#a6967c" align="center" text="答对题数:"/>
+    <text id="n30_9jv6" name="txtAnswerCount" xy="212,54" size="16,33" group="n32_9jv6" fontSize="23" color="#af5638" text="0"/>
+    <group id="n32_9jv6" name="n32" xy="-56,-64" size="391,230"/>
   </displayList>
 </component>

FGUIProject/assets/League/components/ListAnswerRewardItem.xml

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="635,50">
+<component size="792,50">
   <displayList>
-    <text id="n19_pvb4" name="txtDesc" xy="0,2" pivot="0.5,0" size="109,41" fontSize="30" align="center" text="答对1题"/>
-    <list id="n20_pvb4" name="listReward" xy="279,0" size="356,50" layout="row" overflow="scroll" colGap="50" defaultItem="ui://eg2y0ldpn3xha1">
+    <text id="n19_pvb4" name="txtDesc" xy="55,4" pivot="0.5,0" size="107,42" font="ui://eg2y0ldpa0cftks" fontSize="30" color="#a9733e" align="center" text="答对1题"/>
+    <list id="n20_pvb4" name="listReward" xy="436,0" size="356,50" layout="row" overflow="scroll" colGap="30" defaultItem="ui://eg2y0ldpn3xha1">
       <item/>
       <item/>
     </list>
+    <image id="n21_9jv6" name="n21" src="9jv664" fileName="images/lm_zsd.png" xy="0,15"/>
   </displayList>
 </component>

FGUIProject/assets/League/components/ListChatItem.xml

@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="661,167">
+<component size="485,155">
   <displayList>
-    <image id="n35_pvb4" name="n35" src="wm603d" fileName="images/lm_yeqian_db.png" xy="155,86" size="306,67">
-      <relation target="n34_pvb4" sidePair="height-height"/>
-    </image>
-    <component id="n31_pvb4" name="comHead" src="o9ghtlp" fileName="components/ComHeadWithLv2.xml" pkg="eg2y0ldp" xy="0,0" scale="0.7,0.7">
+    <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="165,41" size="211,41" group="n37_pvb4" fontSize="30" align="center" text="玩家名字七个字"/>
-    <loader id="n36_pvb4" name="loaTitle" xy="376,37" size="50,50" group="n37_pvb4"/>
-    <group id="n37_pvb4" name="n37" xy="165,37" size="261,50" advanced="true" layout="hz" excludeInvisibles="true">
+    <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>
-    <text id="n34_pvb4" name="txtChatContent" xy="170,98" size="276,42" fontSize="30" autoSize="height" text=""/>
+    <image id="n35_pvb4" name="n35" src="9jv66t" fileName="images/lm_dt_dhdk.png" xy="113,62" size="367,84" group="n38_9jv6">
+      <relation target="n34_pvb4" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n34_pvb4" name="txtChatContent" xy="139,66" size="318,73" group="n38_9jv6" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#915e15" leading="0" letterSpacing="-2" autoClearText="true" text="玩家发言内容玩家发言内容&#xD;&#xA;玩家发言内容玩家"/>
+    <group id="n38_9jv6" name="n38" xy="113,62" size="367,84"/>
   </displayList>
   <relation target="n34_pvb4" sidePair="height-height"/>
 </component>

FGUIProject/assets/League/components/ListChatItemMine.xml

@@ -1,18 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="661,167">
+<component size="491,150">
   <displayList>
-    <image id="n35_pvb4" name="n35" src="wm603d" fileName="images/lm_yeqian_db.png" xy="197,86" size="306,67">
-      <relation target="n34_pvb4" sidePair="height-height"/>
-    </image>
-    <component id="n31_pvb4" name="comHead" src="o9ghtlp" fileName="components/ComHeadWithLv2.xml" pkg="eg2y0ldp" xy="465,-31" pivot="0.5,0.5" scale="0.7,0.7">
+    <component id="n31_pvb4" name="comHead" src="o9ghtlp" fileName="components/ComHeadWithLv2.xml" pkg="eg2y0ldp" xy="321,-57" pivot="0.5,0.5" group="n41_miy3" scale="0.5,0.5">
       <relation target="" sidePair="right-right"/>
     </component>
-    <text id="n34_pvb4" name="txtChatContent" xy="212,98" size="276,42" fontSize="30" autoSize="height" text=""/>
-    <loader id="n36_pvb4" name="loaTitle" xy="235,34" size="50,50" group="n37_pvb4"/>
-    <text id="n32_pvb4" name="txtName" xy="285,41" size="211,41" group="n37_pvb4" fontSize="30" align="center" text="玩家名字七个字"/>
-    <group id="n37_pvb4" name="n37" xy="235,34" size="261,50" advanced="true" layout="hz" excludeInvisibles="true">
+    <loader id="n36_pvb4" name="loaTitle" xy="82,29" size="117,28" group="n37_pvb4" url="ui://tw70qm9d9jv66k" autoSize="true"/>
+    <text id="n32_pvb4" name="txtName" xy="204,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="82,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="5,69" size="372,80" group="n38_9jv6">
+      <relation target="n34_pvb4" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n34_pvb4" name="txtChatContent" xy="28,74" pivot="1,0" size="322,73" group="n38_9jv6" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#95514d" leading="0" letterSpacing="-2" autoSize="none" text="玩家发言内容玩家发言内容 玩家发言内容玩家"/>
+    <group id="n38_9jv6" name="n38" xy="5,69" size="372,80" group="n41_miy3" advanced="true">
       <relation target="" sidePair="right-right"/>
     </group>
+    <group id="n41_miy3" name="n41" xy="5,-57" size="546,230"/>
   </displayList>
   <relation target="n34_pvb4" sidePair="height-height"/>
 </component>

FGUIProject/assets/League/components/ListGiftButItem.xml

@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1255,801">
+<component size="375,801">
   <displayList>
-    <image id="n19_9jv6" name="n19" src="9jv65t" fileName="images/lm_kp_db_chang.png" xy="438,0" group="n22_9jv6"/>
-    <loader id="n12_pvb4" name="loaIcon" xy="572,265" pivot="0.5,0.5" size="112,112" group="n22_9jv6" url="ui://eg2y0ldpu2u3tkq" autoSize="true"/>
-    <text id="n15_pvb4" name="txtCount" xy="648,437" pivot="0.5,0" size="144,34" group="n22_9jv6" font="ui://eg2y0ldpa0cftks" fontSize="24" color="#b08548" letterSpacing="-2" text="今日剩余：1/1"/>
-    <component id="n14_pvb4" name="btnBuy" src="rv091x" fileName="components/Button17.xml" xy="564,588" group="n22_9jv6">
+    <image id="n19_9jv6" name="n19" src="9jv65t" fileName="images/lm_kp_db_chang.png" xy="0,0" group="n22_9jv6"/>
+    <loader id="n12_pvb4" name="loaIcon" xy="134,265" pivot="0.5,0.5" size="112,112" group="n22_9jv6" url="ui://eg2y0ldpu2u3tkq" autoSize="true"/>
+    <text id="n15_pvb4" name="txtCount" xy="210,437" pivot="0.5,0" size="144,34" group="n22_9jv6" font="ui://eg2y0ldpa0cftks" fontSize="24" color="#b08548" letterSpacing="-2" text="今日剩余：1/1"/>
+    <component id="n14_pvb4" name="btnBuy" src="rv091x" fileName="components/Button17.xml" xy="126,588" group="n22_9jv6">
       <Button title="采购" icon="ui://tw70qm9d9jv66c"/>
     </component>
-    <component id="n16_pvb4" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="562,636" pivot="0.5,0" group="n22_9jv6" scale="0.7,0.7" controller="c1,1"/>
-    <list id="n13_pvb4" name="listGift" xy="0,485" pivot="0.5,0" size="1255,267" group="n22_9jv6" scale="0.305,0.305" layout="row" colGap="15" defaultItem="ui://eg2y0ldp9jv6tls" align="center">
+    <component id="n16_pvb4" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="124,636" pivot="0.5,0" group="n22_9jv6" scale="0.7,0.7" controller="c1,1"/>
+    <list id="n13_pvb4" name="listGift" xy="-438,485" pivot="0.5,0" size="1255,267" group="n22_9jv6" scale="0.305,0.305" layout="row" colGap="15" defaultItem="ui://eg2y0ldp9jv6tls" align="center">
       <item/>
       <item/>
       <item/>
     </list>
-    <text id="n18_pvb4" name="txtTime" xy="696,117" pivot="0.5,0" size="102,39" group="n22_9jv6" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#be8f4d" align="center" ubb="true" text="剩余1天"/>
-    <loader id="n21_9jv6" name="loaType" xy="457,99" size="62,203" group="n22_9jv6" url="ui://tw70qm9d9jv66x" autoSize="true"/>
-    <group id="n22_9jv6" name="n22" xy="0,0" size="1255,801"/>
+    <text id="n18_pvb4" name="txtTime" xy="258,117" pivot="0.5,0" size="102,39" group="n22_9jv6" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#be8f4d" align="center" ubb="true" text="剩余1天"/>
+    <loader id="n21_9jv6" name="loaType" xy="19,99" size="62,203" group="n22_9jv6" url="ui://tw70qm9d9jv66x" autoSize="true"/>
+    <group id="n22_9jv6" name="n22" xy="-438,0" size="1255,801"/>
   </displayList>
 </component>

FGUIProject/assets/League/components/ListGiftBuyItemBottom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="377,735" overflow="hidden">
   <displayList>
-    <component id="n23_9jv6" name="comItem" src="9jv678" fileName="components/ListGiftButItem.xml" xy="-439,-66"/>
+    <component id="n23_9jv6" name="comItem" src="9jv678" fileName="components/ListGiftButItem.xml" xy="1,-66"/>
   </displayList>
 </component>

FGUIProject/assets/League/components/ListGiftBuyItemCenter.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="377,648" overflow="hidden">
   <displayList>
-    <component id="n23_9jv6" name="comItem" src="9jv678" fileName="components/ListGiftButItem.xml" xy="-439,-65"/>
+    <component id="n23_9jv6" name="comItem" src="9jv678" fileName="components/ListGiftButItem.xml" xy="1,-65"/>
   </displayList>
 </component>

FGUIProject/assets/League/components/ListGiftBuyItemTop.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="377,712" overflow="hidden">
   <displayList>
-    <component id="n19_9jv6" name="comItem" src="9jv678" fileName="components/ListGiftButItem.xml" xy="-438,0"/>
+    <component id="n19_9jv6" name="comItem" src="9jv678" fileName="components/ListGiftButItem.xml" xy="1,0"/>
   </displayList>
 </component>

FGUIProject/assets/League/components/ListGiftGetItem.xml

@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1113,759">
-  <controller name="c1" pages="0,,1," selected="0">
+<component size="386,759">
+  <controller name="c1" pages="0,,1," selected="1">
     <remark page="0" value="可领取"/>
     <remark page="1" value="已领取"/>
   </controller>
   <displayList>
-    <loader id="n29_9jv6" name="n29" xy="368,0" size="377,754" group="n28_9jv6" url="ui://tw70qm9d9jv65s" align="center" vAlign="middle" autoSize="true">
+    <loader id="n29_9jv6" name="n29" xy="5,0" size="377,754" group="n28_9jv6" url="ui://tw70qm9d9jv65p" align="center" vAlign="middle" autoSize="true">
       <gearIcon controller="c1" pages="0" values="ui://tw70qm9d9jv65s" default="ui://tw70qm9d9jv65p"/>
     </loader>
-    <loader id="n21_9jv6" name="loaType" xy="385,101" size="62,203" group="n28_9jv6" url="ui://tw70qm9d9jv66x" autoSize="true"/>
-    <loader id="n15_pvb4" name="loaIcon" xy="500,260" pivot="0.5,0.5" size="112,112" group="n28_9jv6" url="ui://eg2y0ldpu2u3tkq" autoSize="true"/>
-    <list id="n13_pvb4" name="listGift" xy="0,493" pivot="0.5,0" size="1113,266" group="n28_9jv6" scale="0.305,0.305" layout="row" colGap="15" defaultItem="ui://eg2y0ldp9jv6tls" align="center">
+    <loader id="n21_9jv6" name="loaType" xy="22,101" size="62,203" group="n28_9jv6" url="ui://tw70qm9d9jv66x" autoSize="true"/>
+    <loader id="n15_pvb4" name="loaIcon" xy="137,260" pivot="0.5,0.5" size="112,112" group="n28_9jv6" url="ui://eg2y0ldpu2u3tkq" autoSize="true"/>
+    <list id="n13_pvb4" name="listGift" xy="-363,493" pivot="0.5,0" size="1113,266" group="n28_9jv6" scale="0.305,0.305" layout="row" colGap="15" defaultItem="ui://eg2y0ldp9jv6tls" align="center">
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
-    <image id="n26_9jv6" name="n26" src="9jv66g" fileName="images/lm_biaoqian_ylq.png" xy="391,300" group="n28_9jv6">
+    <image id="n26_9jv6" name="n26" src="9jv66g" fileName="images/lm_biaoqian_ylq.png" xy="28,300" group="n28_9jv6">
       <gearDisplay controller="c1" pages="1"/>
     </image>
-    <group id="n28_9jv6" name="n28" xy="0,0" size="1113,759"/>
+    <group id="n28_9jv6" name="n28" xy="-363,0" size="1113,759"/>
   </displayList>
 </component>

FGUIProject/assets/League/components/ListGiftGetItemBottom.xml

@@ -5,6 +5,6 @@
     <remark page="1" value="已领取"/>
   </controller>
   <displayList>
-    <component id="n29_9jv6" name="comItem" src="9jv679" fileName="components/ListGiftGetItem.xml" xy="-368,-65"/>
+    <component id="n29_9jv6" name="comItem" src="9jv679" fileName="components/ListGiftGetItem.xml" xy="-4,-65"/>
   </displayList>
 </component>

FGUIProject/assets/League/components/ListGiftGetItemCenter.xml

@@ -5,6 +5,6 @@
     <remark page="1" value="已领取"/>
   </controller>
   <displayList>
-    <component id="n30_9jv6" name="comItem" src="9jv679" fileName="components/ListGiftGetItem.xml" xy="-368,-65"/>
+    <component id="n30_9jv6" name="comItem" src="9jv679" fileName="components/ListGiftGetItem.xml" xy="-4,-65"/>
   </displayList>
 </component>

FGUIProject/assets/League/components/ListGiftGetItemTop.xml

@@ -5,6 +5,6 @@
     <remark page="1" value="已领取"/>
   </controller>
   <displayList>
-    <component id="n30_9jv6" name="comItem" src="9jv679" fileName="components/ListGiftGetItem.xml" xy="-368,0"/>
+    <component id="n30_9jv6" name="comItem" src="9jv679" fileName="components/ListGiftGetItem.xml" xy="-4,0"/>
   </displayList>
 </component>

FGUIProject/assets/League/components/ListRankItem.xml

@@ -1,16 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="750,131">
-  <controller name="c1" pages="0,,1,,2,,3," selected="0"/>
+<component size="918,131">
+  <controller name="c1" pages="0,,1,,2,,3," selected="1"/>
+  <controller name="c2" exported="true" pages="0,,1," selected="1">
+    <remark page="0" value="别人"/>
+    <remark page="1" value="自己"/>
+  </controller>
   <displayList>
-    <loader id="n19_pvb4" name="loaRank" xy="12,39" size="50,50">
+    <image id="n28_9jv6" name="n28" src="9jv65u" fileName="images/lm_phb_dk.png" xy="0,1">
+      <gearDisplay controller="c2" pages="1"/>
+    </image>
+    <image id="n26_9jv6" name="n26" src="wm603t" fileName="images/lm_zhuangshixian_duan.png" xy="64,121" group="n25_9jv6">
+      <gearDisplay controller="c2" pages="0"/>
+    </image>
+    <loader id="n19_pvb4" name="loaRank" xy="37,14" size="83,83" group="n25_9jv6" url="ui://tw70qm9d9jv65y" autoSize="true">
       <gearDisplay controller="c1" pages="0,1,2"/>
+      <gearIcon controller="c1" pages="0,1,2" values="ui://tw70qm9d9jv65x|ui://tw70qm9d9jv65y|ui://tw70qm9d9jv65z" default=""/>
     </loader>
-    <text id="n20_pvb4" name="txtRank" xy="17,42" size="40,42" fontSize="30" text="">
+    <text id="n20_pvb4" name="txtRank" xy="57,24" pivot="0.5,0" size="48,62" group="n25_9jv6" font="ui://eg2y0ldpa0cftks" fontSize="46" color="#96716d" text="10">
       <gearDisplay controller="c1" pages="3"/>
     </text>
-    <component id="n21_pvb4" name="comHead" src="o9ghtlp" fileName="components/ComHeadWithLv2.xml" pkg="eg2y0ldp" xy="88,0" scale="0.5,0.5"/>
-    <text id="n22_pvb4" name="txtName" xy="207,22" size="172,34" fontSize="24" text="玩家名字七个字"/>
-    <loader id="n23_pvb4" name="loatitle" xy="206,64" size="60,60" url="ui://eg2y0ldpkztethq" autoSize="true"/>
-    <text id="n24_pvb4" name="txtContent" xy="629,48" pivot="0.5,0" size="103,34" fontSize="24" align="center" text="答对10题"/>
+    <component id="n21_pvb4" name="comHead" src="o9ghtlp" fileName="components/ComHeadWithLv2.xml" pkg="eg2y0ldp" xy="76,-59" pivot="0.5,0.5" group="n25_9jv6" scale="0.6,0.6"/>
+    <text id="n22_pvb4" name="txtName" xy="260,16" size="200,39" group="n25_9jv6" font="ui://eg2y0ldpa0cftkz" fontSize="28" color="#a8593a" text="玩家名字七个字"/>
+    <loader id="n23_pvb4" name="loatitle" xy="260,67" size="117,28" group="n25_9jv6" url="ui://tw70qm9d9jv66v" autoSize="true">
+      <gearIcon controller="c1" pages="0,1,2,3" values="ui://tw70qm9d9jv66k|ui://tw70qm9d9jv66v|ui://tw70qm9d9jv66l|"/>
+    </loader>
+    <text id="n24_pvb4" name="txtContent" xy="741,45" pivot="0.5,0" size="131,44" group="n25_9jv6" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#956837" align="center" vars="true" text="答对10题"/>
+    <group id="n25_9jv6" name="n25" xy="37,-59" size="843,230"/>
   </displayList>
 </component>

FGUIProject/assets/League/package.xml

@@ -51,7 +51,7 @@
     <image id="a0cf2h" name="lm_tb.png" path="/images/"/>
     <image id="a0cf2j" name="lm_yz.png" path="/images/"/>
     <image id="a0cf2n" name="lm_sousuok2.png" path="/images/"/>
-    <image id="a0cf2o" name="lm_an_yellow.png" path="/images/"/>
+    <image id="a0cf2o" name="lm_an_yellow.png" path="/images/" scale="9grid" scale9grid="54,15,108,30"/>
     <image id="a0cf2p" name="lm_tb_huanyp.png" path="/images/"/>
     <image id="a0cf2q" name="lm_db_chang.png" path="/images/" scale="9grid" scale9grid="0,486,1080,275"/>
     <image id="a0cf2r" name="lm_kuang_1.png" path="/images/"/>
@@ -178,17 +178,17 @@
     <image id="9jv66n" name="lm_daoju_db.png" path="/images/"/>
     <image id="9jv66o" name="lm_djs_db.png" path="/images/"/>
     <image id="9jv66p" name="lm_dt_cwdk.png" path="/images/"/>
-    <image id="9jv66q" name="lm_dt_cy_db.png" path="/images/"/>
+    <image id="9jv66q" name="lm_dt_cy_db.png" path="/images/" scale="9grid" scale9grid="85,298,170,596"/>
     <image id="9jv66r" name="lm_dt_cy_dk.png" path="/images/"/>
-    <image id="9jv66s" name="lm_dt_db.png" path="/images/"/>
-    <image id="9jv66t" name="lm_dt_dhdk.png" path="/images/"/>
-    <image id="9jv66u" name="lm_dt_dhdk2.png" path="/images/"/>
+    <image id="9jv66s" name="lm_dt_db.png" path="/images/" scale="9grid" scale9grid="270,1549,540,182"/>
+    <image id="9jv66t" name="lm_dt_dhdk.png" path="/images/" scale="9grid" scale9grid="67,24,128,11"/>
+    <image id="9jv66u" name="lm_dt_dhdk2.png" path="/images/" scale="9grid" scale9grid="99,28,200,36"/>
     <image id="9jv66v" name="lm_bq_xcm.png" path="/images/"/>
-    <image id="9jv66w" name="组6635.png" path="/images/"/>
-    <image id="9jv66x" name="lm_biaoqian_1.png" path="/images/"/>
-    <image id="9jv66y" name="lm_biaoqian_2.png" path="/images/"/>
-    <image id="9jv66z" name="lm_biaoqian_3.png" path="/images/"/>
-    <image id="9jv670" name="lm_biaoqian_4.png" path="/images/"/>
+    <image id="9jv66w" name="lm_dt_icon_db.png" path="/images/"/>
+    <image id="9jv66x" name="lm_biaoqian_1.png" path="/images/" exported="true"/>
+    <image id="9jv66y" name="lm_biaoqian_2.png" path="/images/" exported="true"/>
+    <image id="9jv66z" name="lm_biaoqian_3.png" path="/images/" exported="true"/>
+    <image id="9jv670" name="lm_biaoqian_4.png" path="/images/" exported="true"/>
     <image id="9jv671" name="lm_fl_zsdz.png" path="/images/"/>
     <image id="9jv672" name="lm_fl_zsdz_chang.png" path="/images/"/>
     <component id="9jv673" name="ListGiftGetItemCenter.xml" path="/components/" exported="true"/>
@@ -198,6 +198,9 @@
     <component id="9jv677" name="Button81.xml" path="/components/"/>
     <component id="9jv678" name="ListGiftButItem.xml" path="/components/"/>
     <component id="9jv679" name="ListGiftGetItem.xml" path="/components/"/>
+    <component id="9jv67a" name="Button122.xml" path="/components/"/>
+    <component id="9jv67b" name="ListAnswerRuleItem.xml" path="/"/>
+    <component id="9jv67c" name="Button123.xml" path="/components/" exported="true"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\League" packageCount="2" genCode="true" maxAtlasSize="2048" extractAlpha="true"/>
 </packageDescription>

GameClient/Assets/Editor/Excel/Scanner/ShopScanner.cs

@@ -267,15 +267,15 @@ namespace GFGEditor
                     }
                     else if (itemCfg.itemType == ConstItemType.PHOTOGRAPH)
                     {
-                        if (itemCfg.subType == ConstItemSubType.NPC)
+                        if (itemCfg.subType == ConstItemSubType.PHOTOGRAPH_NPC)
                         {
                             count = 1;//人物
                         }
-                        else if (itemCfg.subType == ConstItemSubType.BOREDR)
+                        else if (itemCfg.subType == ConstItemSubType.PHOTOGRAPH_BOREDR)
                         {
                             count = 3;//npc
                         }
-                        else if (itemCfg.subType == ConstItemSubType.EFFECT)
+                        else if (itemCfg.subType == ConstItemSubType.PHOTOGRAPH_EFFECT)
                         {
                             count = 4;//滤镜
                         }

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

@@ -1,20 +0,0 @@
-
-namespace GFGGame
-{
-    public class ConstItemSubType
-    {
-        /// <summary>
-        /// npc
-        /// </summary>
-        public const int NPC = 1;
-        /// <summary>
-        /// 拍照边框
-        /// </summary>
-        public const int BOREDR = 2;
-        /// <summary>
-        /// 拍照滤镜
-        /// </summary>
-        public const int EFFECT = 3;
-
-    }
-}

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

@@ -54,16 +54,16 @@ namespace GFGGame
             }
             else if (itemCfg.itemType == ConstItemType.PHOTOGRAPH)
             {
-                if (itemCfg.subType == ConstItemSubType.NPC)
+                if (itemCfg.subType == ConstItemSubType.PHOTOGRAPH_NPC)
                 {
                     if (listNpcData.IndexOf(itemID) < 0) listNpcData.Add(itemID);
                 }
-                else if (itemCfg.subType == ConstItemSubType.BOREDR)
+                else if (itemCfg.subType == ConstItemSubType.PHOTOGRAPH_BOREDR)
                 {
                     if (listBorderData.IndexOf(ConstItemID.BORDERID) < 0) listBorderData.Insert(0, ConstItemID.BORDERID);
                     if (listBorderData.IndexOf(itemID) < 0) listBorderData.Add(itemID);
                 }
-                else if (itemCfg.subType == ConstItemSubType.EFFECT)
+                else if (itemCfg.subType == ConstItemSubType.PHOTOGRAPH_EFFECT)
                 {
                     if (listEffectData.IndexOf(ConstItemID.EFFECTID) < 0) listEffectData.Insert(0, ConstItemID.EFFECTID);
                     if (listEffectData.IndexOf(itemID) < 0) listEffectData.Add(itemID);

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

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.League
+{
+    public partial class UI_Button123
+    {
+        public GButton target;
+        public Controller m_c1;
+        public const string URL = "ui://tw70qm9d9jv67c";
+        public const string PACKAGE_NAME = "League";
+        public const string RES_NAME = "Button123";
+        private static UI_Button123 _proxy;
+
+        public static UI_Button123 Create(GObject gObject = null)
+        {
+            var ui = new UI_Button123();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_Button123 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Button123();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)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");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Constant/ConstItemSubType.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_Button123.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 3ee1036cfb448ef438a0625af7ade62a
+guid: 92a44cf5ee6851d46a8bf373832f3c44
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -9,8 +9,7 @@ namespace UI.League
         public GComponent target;
         public Controller m_c1;
         public GButton m_btnClose;
-        public GButton m_btnRule;
-        public GTextField m_txtRule;
+        public GList m_listRule;
         public GList m_list;
         public const string URL = "ui://tw70qm9dpvb458";
         public const string PACKAGE_NAME = "League";
@@ -61,16 +60,14 @@ namespace UI.League
         {
             m_c1 = comp.GetController("c1");
             m_btnClose = (GButton)comp.GetChild("btnClose");
-            m_btnRule = (GButton)comp.GetChild("btnRule");
-            m_txtRule = (GTextField)comp.GetChild("txtRule");
+            m_listRule = (GList)comp.GetChild("listRule");
             m_list = (GList)comp.GetChild("list");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
             m_btnClose = null;
-            m_btnRule = null;
-            m_txtRule = null;
+            m_listRule = null;
             m_list = null;
             if(disposeTarget && target != null)
             {

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

@@ -8,7 +8,7 @@ namespace UI.League
     {
         public GComponent target;
         public GButton m_btnRank;
-        public GComponent m_comHead;
+        public UI_ComHeadIcon m_comHead;
         public GTextField m_txtName;
         public GTextField m_txtRule;
         public GTextField m_txtTime;
@@ -61,7 +61,7 @@ namespace UI.League
         private void Init(GComponent comp)
         {
             m_btnRank = (GButton)comp.GetChild("btnRank");
-            m_comHead = (GComponent)comp.GetChild("comHead");
+            m_comHead = (UI_ComHeadIcon)UI_ComHeadIcon.Create(comp.GetChild("comHead"));
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_txtRule = (GTextField)comp.GetChild("txtRule");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
@@ -70,6 +70,7 @@ namespace UI.League
         public void Dispose(bool disposeTarget = false)
         {
             m_btnRank = null;
+            m_comHead.Dispose();
             m_comHead = null;
             m_txtName = null;
             m_txtRule = null;

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

@@ -10,6 +10,7 @@ namespace UI.League
         public Controller m_ctrlHasIcon;
         public Controller m_ctrlQuestionState;
         public Controller m_ctrlQuestionType;
+        public Controller m_ctrlResult;
         public GLoader m_loaBg;
         public GButton m_btnBack;
         public GTextField m_txtTime;
@@ -17,11 +18,12 @@ namespace UI.League
         public GTextField m_txtRightCount;
         public GTextField m_txtAnswerTime;
         public GTextField m_txtAnswerNum;
-        public GLoader m_loaIocn;
         public GTextField m_txtContent;
         public GList m_listResult;
         public GTextInput m_txtResult;
-        public GComponent m_comRightHead;
+        public GTextField m_txtRightCount1;
+        public GLoader m_loaIocn;
+        public UI_ComHeadIcon m_comRightHead;
         public GImage m_imgFail;
         public GTextField m_txtInfo;
         public GTextField m_txtCdTime;
@@ -80,6 +82,7 @@ namespace UI.League
             m_ctrlHasIcon = comp.GetController("ctrlHasIcon");
             m_ctrlQuestionState = comp.GetController("ctrlQuestionState");
             m_ctrlQuestionType = comp.GetController("ctrlQuestionType");
+            m_ctrlResult = comp.GetController("ctrlResult");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
@@ -87,11 +90,12 @@ namespace UI.League
             m_txtRightCount = (GTextField)comp.GetChild("txtRightCount");
             m_txtAnswerTime = (GTextField)comp.GetChild("txtAnswerTime");
             m_txtAnswerNum = (GTextField)comp.GetChild("txtAnswerNum");
-            m_loaIocn = (GLoader)comp.GetChild("loaIocn");
             m_txtContent = (GTextField)comp.GetChild("txtContent");
             m_listResult = (GList)comp.GetChild("listResult");
             m_txtResult = (GTextInput)comp.GetChild("txtResult");
-            m_comRightHead = (GComponent)comp.GetChild("comRightHead");
+            m_txtRightCount1 = (GTextField)comp.GetChild("txtRightCount1");
+            m_loaIocn = (GLoader)comp.GetChild("loaIocn");
+            m_comRightHead = (UI_ComHeadIcon)UI_ComHeadIcon.Create(comp.GetChild("comRightHead"));
             m_imgFail = (GImage)comp.GetChild("imgFail");
             m_txtInfo = (GTextField)comp.GetChild("txtInfo");
             m_txtCdTime = (GTextField)comp.GetChild("txtCdTime");
@@ -106,6 +110,7 @@ namespace UI.League
             m_ctrlHasIcon = null;
             m_ctrlQuestionState = null;
             m_ctrlQuestionType = null;
+            m_ctrlResult = null;
             m_loaBg = null;
             m_btnBack = null;
             m_txtTime = null;
@@ -113,10 +118,12 @@ namespace UI.League
             m_txtRightCount = null;
             m_txtAnswerTime = null;
             m_txtAnswerNum = null;
-            m_loaIocn = null;
             m_txtContent = null;
             m_listResult = null;
             m_txtResult = null;
+            m_txtRightCount1 = null;
+            m_loaIocn = null;
+            m_comRightHead.Dispose();
             m_comRightHead = null;
             m_imgFail = null;
             m_txtInfo = null;

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

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

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

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

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

@@ -8,6 +8,7 @@ namespace UI.League
     {
         public GComponent target;
         public Controller m_c1;
+        public Controller m_c2;
         public GLoader m_loaRank;
         public GTextField m_txtRank;
         public GComponent m_comHead;
@@ -62,6 +63,7 @@ namespace UI.League
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
+            m_c2 = comp.GetController("c2");
             m_loaRank = (GLoader)comp.GetChild("loaRank");
             m_txtRank = (GTextField)comp.GetChild("txtRank");
             m_comHead = (GComponent)comp.GetChild("comHead");
@@ -72,6 +74,7 @@ namespace UI.League
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
+            m_c2 = null;
             m_loaRank = null;
             m_txtRank = null;
             m_comHead = null;

GameClient/Assets/Game/HotUpdate/ServerProxy/LeagueSproxy.cs

@@ -263,6 +263,7 @@ namespace GFGGame
                 LeagueDataManager.Instance.SetNumeric(LeagueNumericType.LeagueQuestionStatusEndTime, message.Time);
             }
             LeagueDataManager.Instance.LastAnswerRoleData.LastQuestionResult = message.Type;
+            LeagueDataManager.Instance.LastAnswerRoleData.MyAnswer = "";
             EventAgent.DispatchEvent(ConstMessage.LEAGUE_ANSWER_END, message.Type);
             await ETTask.CompletedTask;
         }

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

@@ -35,6 +35,8 @@ namespace GFGGame
 
             _ui.m_btnClose.onClick.Add(Hide);
             _ui.m_c1.onChanged.Add(OnCtrlChange);
+
+            _ui.m_list.itemRenderer = RenderListItem;
         }
         protected override void AddEventListener()
         {

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

@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using System.Text.RegularExpressions;
 using ET;
 using FairyGUI;
@@ -10,6 +11,7 @@ namespace GFGGame
     public class LeagueAnswerRewardView : BaseWindow
     {
         private UI_LeagueAnswerRewardUI _ui;
+        List<string> ruleDatas = new List<string>();
 
         public override void Dispose()
         {
@@ -34,6 +36,7 @@ namespace GFGGame
 
             _ui.m_btnClose.onClick.Add(Hide);
             _ui.m_list.itemRenderer = RenderListItem;
+            _ui.m_listRule.itemRenderer = RenderListRuleItem;
         }
         protected override void AddEventListener()
         {
@@ -43,14 +46,23 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            _ui.m_txtRule.text = TextDescArray.Instance.GetCfg(300008).text;
+            // _ui.m_txtRule.text = TextDescArray.Instance.GetCfg(300008).text;
             _ui.m_list.numItems = LeagueQuestionBonusCfgArray.Instance.dataArray.Length;
+
+            string[] rules = TextDescArray.Instance.GetCfg(300008).text.Split('.');
+            for (int i = 0; i < rules.Length; i++)
+            {
+                if (i > 0 && rules[i - 1] == ".")
+                {
+                    ruleDatas.Add(rules[i]);
+                }
+            }
         }
 
         protected override void OnHide()
         {
             base.OnHide();
-
+            ruleDatas.Clear();
         }
 
         protected override void RemoveEventListener()
@@ -59,6 +71,12 @@ namespace GFGGame
 
         }
 
+        private void RenderListRuleItem(int index, GObject obj)
+        {
+            UI_ListAnswerRuleItem item = UI_ListAnswerRuleItem.Proxy(obj);
+            item.m_txtRule.text = ruleDatas[index];
+            UI_ListAnswerRuleItem.ProxyEnd();
+        }
         private void RenderListItem(int index, GObject obj)
         {
             UI_ListAnswerRewardItem item = UI_ListAnswerRewardItem.Proxy(obj);

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

@@ -69,7 +69,7 @@ namespace GFGGame
         private void UpdateView()
         {
             OtherRoleInfoData roleInfo = LeagueDataManager.Instance.LeagueData.LeagueMemberDatas[LeagueDataManager.Instance.LeagueData.LastWeekAnswerNO1Id].RoleInfo;
-            RoleInfoManager.Instance.UpdateHead(_ui.m_comHead, roleInfo.headId, roleInfo.headBorderId);
+            // RoleInfoManager.Instance.UpdateHead(_ui.m_comHead, roleInfo.headId, roleInfo.headBorderId);
             _ui.m_txtName.text = roleInfo.roleName;
             _ui.m_txtRule.text = TextDescCfgArray.Instance.GetCfg(300008).text;
             if (LeagueDataManager.Instance.GetNumeriValue(LeagueNumericType.LeagueQuestionStatus) == LeagueQuestionStatus.End)

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

@@ -42,6 +42,7 @@ namespace GFGGame
             _ui.m_listChat.itemRenderer = RenderListChatItem;
             _ui.m_listChat.itemProvider = GetListItemResource;
             _ui.m_listChat.SetVirtual();
+            _ui.m_txtResult.onFocusOut.Add(OnFocuseOut);
         }
         protected override void AddEventListener()
         {
@@ -113,6 +114,10 @@ namespace GFGGame
             _ui.m_ctrlHasIcon.selectedIndex = string.IsNullOrEmpty(questionCfg.res) ? 1 : 0;
             _ui.m_loaIocn.url = string.IsNullOrEmpty(questionCfg.res) ? "" : ResPathUtil.GetIconPath(questionCfg.res, "png");
             _ui.m_txtContent.text = questionCfg.question;
+            _ui.m_txtResult.enabled =
+            !(!string.IsNullOrEmpty(_dataManager.LastAnswerRoleData.MyAnswer) &&
+            _dataManager.LastAnswerRoleData.LastQuestionId == _dataManager.GetNumeriValue(LeagueNumericType.LeagueQuestionId)
+            && _dataManager.LastAnswerRoleData.MyAnswer != questionCfg.answerCorrect);
             _ui.m_ctrlQuestionType.selectedIndex = questionCfg.type;
             if (questionCfg.type == 1)
             {
@@ -140,19 +145,21 @@ namespace GFGGame
         {
             _ui.m_txtRightCount.text = string.Format("全员已答对{0}题", _dataManager.GetNumeriValue(LeagueNumericType.LeagueQuestionTrueCount));
             _ui.m_ctrlQuestionState.selectedIndex = 1;
+            _ui.m_ctrlResult.selectedIndex = LastQuestionResult.SomeBodyRight;
             if (_dataManager.LastAnswerRoleData.LastQuestionResult == LastQuestionResult.SomeBodyRight)
             {
-                _ui.m_comRightHead.visible = true;
+
+                _ui.m_comRightHead.target.visible = true;
                 _ui.m_imgFail.visible = false;
                 OtherRoleInfoData roleInfoData = _dataManager.GetMemberRoleInfo(_dataManager.LastAnswerRoleData.RightRoleId);
-                RoleInfoManager.Instance.UpdateHeadWithLv(_ui.m_comRightHead, roleInfoData.headId, roleInfoData.headBorderId, roleInfoData.roleLv);
+                RoleInfoManager.Instance.UpdateHeadWithLv(_ui.m_comRightHead.target, roleInfoData.headId, roleInfoData.headBorderId, roleInfoData.roleLv);
                 _ui.m_txtInfo.text = string.Format("{0} 答对了！", roleInfoData.roleName);
                 Timers.inst.Remove(UpdateResultTime);
                 Timers.inst.Add(1, 0, UpdateResultTime);
             }
             else if (_dataManager.LastAnswerRoleData.LastQuestionResult == LastQuestionResult.NobodyRight)
             {
-                _ui.m_comRightHead.visible = false;
+                _ui.m_comRightHead.target.visible = false;
                 _ui.m_imgFail.visible = true;
                 _ui.m_txtInfo.text = "哎呀，没人答对呀，大家加油鸭~";
                 Timers.inst.Remove(UpdateResultTime);
@@ -160,7 +167,7 @@ namespace GFGGame
             }
             else
             {
-                _ui.m_comRightHead.visible = false;
+                _ui.m_comRightHead.target.visible = false;
                 _ui.m_imgFail.visible = false;
                 if (_dataManager.GetNumeriValue(LeagueNumericType.LeagueQuestionCount) == GlobalCfgArray.globalCfg.leagueQuestionNum)//全部答完
                 {
@@ -197,14 +204,19 @@ namespace GFGGame
         private void RenderListResultItem(int index, GObject obj)
         {
             LeagueQuestionCfg cfg = LeagueQuestionCfgArray.Instance.dataArray[index];
-            GButton item = obj as GButton;
+            UI_Button123 item = UI_Button123.Proxy(obj);
             int data = index + 1;
-            item.title = string.Format("{0}.{1}", data, cfg.answerArr[index]);
-            if (item.data == null)
+            item.target.title = string.Format("{0}.{1}", data, cfg.answerArr[index]);
+            string myAnswer = _dataManager.LastAnswerRoleData.MyAnswer;
+            bool isAnswer = !string.IsNullOrEmpty(myAnswer);
+            item.target.enabled = !isAnswer;
+            item.m_c1.selectedIndex = myAnswer == data.ToString() && myAnswer != cfg.answerCorrect.ToString() ? 0 : 1;
+            if (item.target.data == null)
             {
-                item.onClick.Add(OnBtnChooseClick);
+                item.target.onClick.Add(OnBtnChooseClick);
             }
-            item.data = data;
+            item.target.data = data;
+            UI_Button123.ProxyEnd();
         }
         private async void OnBtnChooseClick(EventContext context)
         {
@@ -221,6 +233,15 @@ namespace GFGGame
                 _ui.m_listResult.numItems = cfg.answerArr.Length;
             }
         }
+        private async void OnFocuseOut()
+        {
+            int questionId = (int)_dataManager.GetNumeriValue(LeagueNumericType.LeagueQuestionId);
+            bool result = await LeagueSproxy.ReqAnswerQuestion(questionId, _ui.m_txtResult.text);
+            if (result)
+            {
+                _ui.m_txtResult.enabled = false;
+            }
+        }
         private void RenderListJoinItem(int index, GObject obj)
         {
             OtherRoleInfoData roleInfo = _dataManager.LeagueData.LeagueMemberDatas[_memberIds[index]].RoleInfo;

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

@@ -52,7 +52,7 @@ namespace GFGGame
         protected override void AddEventListener()
         {
             base.AddEventListener();
-            EventAgent.AddEventListener(ConstMessage.NUMERIC_CHANGE, UpdateBuyList);
+            EventAgent.AddEventListener(ConstMessage.NUMERIC_CHANGE, UpdateView);
             EventAgent.AddEventListener(ConstMessage.LEAGUE_NUMBERIC_CHANGE, UpdateView);
         }
         protected override void OnShown()
@@ -106,6 +106,8 @@ namespace GFGGame
             {
                 item.m_comItem.m_listGift.itemRenderer = RenderListRewardItem;
             }
+            item.m_comItem.m_c1.selectedIndex = _getDatas[index].IsGet ? 1 : 0;
+            item.m_comItem.m_loaType.url = string.Format("ui://League/lm_biaoqian_{0}", _getDatas[index].GiftCfg.type);
             item.m_comItem.m_listGift.data = _getDatas[index].GiftCfg.bonusArr;
             item.m_comItem.m_listGift.numItems = _getDatas[index].GiftCfg.bonusArr.Length;
             UI_ListGiftGetItemTop.ProxyEnd();
@@ -116,8 +118,10 @@ namespace GFGGame
             LeagueGiftBuyData buyData = _buyDatas[index];
             string strCount = buyData.GiftCfg.limitType == 1 ? "今日剩余：{0}/{1}" : "本周剩余：{0}/{1}";
             item.m_comItem.m_txtCount.text = string.Format(strCount, buyData.GiftCfg.limit - buyData.BuyCount, buyData.GiftCfg.limit);
-            long day = buyData.EndTime / TimeUtil.SECOND_PER_DAY / 1000;// TimeUtil.FormattingTime11(TimeHelper.ServerNow(), TimeHelper.ServerNow() + buyData.EndTime);
+            long day = TimeUtil.FormattingTime11(TimeHelper.ServerNow(), buyData.EndTime);
+            // long day = buyData.EndTime / TimeUtil.SECOND_PER_DAY / 1000;// TimeUtil.FormattingTime11(TimeHelper.ServerNow(), TimeHelper.ServerNow() + buyData.EndTime);
             // item.m_txtTime.text = buyData.EndTime == 0 ? "" : string.Format("（剩余{0}天）", day);
+            item.m_comItem.m_loaType.url = string.Format("ui://League/lm_biaoqian_{0}", _buyDatas[index].GiftCfg.type);
             item.m_comItem.m_txtTime.visible = buyData.EndTime != 0;
             item.m_comItem.m_txtTime.text = string.Format("剩余{0}天", StringUtil.GetColorText(day.ToString(), "#E45E29"));
             ItemUtil.UpdateItemNeedNum(item.m_comItem.m_comCost, buyData.GiftCfg.consumeArr[0]);

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

@@ -51,8 +51,7 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            int myPos = LeagueDataManager.Instance.GetMyPos();
-            _ui.m_c1.selectedIndex = myPos == LeaguePos.Owner || myPos == LeaguePos.SubOwner ? 1 : 0;
+
             UpdateMember();
             UpdateBtnRecruit();
 
@@ -125,7 +124,7 @@ namespace GFGGame
                 }
                 else
                 {
-                    AlertUI.Show("您加入的时间不足一天")
+                    AlertUI.Show("您忍心退出雅集，离开小伙伴们吗？")
                     .SetLeftButton(true, "取消")
                     .SetRightButton(true, "确认", async (object param) =>
                     {
@@ -140,6 +139,9 @@ namespace GFGGame
         }
         private void UpdateMember()
         {
+            int myPos = LeagueDataManager.Instance.GetMyPos();
+            _ui.m_c1.selectedIndex = myPos == LeaguePos.Owner || myPos == LeaguePos.SubOwner ? 1 : 0;
+
             _leagueData = LeagueDataManager.Instance.LeagueData;
             _memberIds = new List<long>(_leagueData.LeagueMemberDatas.Keys);
 

GameClient/Assets/ResIn/UI/League/League_atlas0_8!a.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 8494bd312c0ed844889deda3b19e4dc6
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/ResIn/UI/League/League_atlas0_8.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: bc37b8e47f9fb7c4da5da8b8029347a6
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: