雅集

FGUIProject/assets/League/LeagueAnswerUI.xml

@@ -6,20 +6,20 @@
     <component id="n3_pvb4" name="btnRank" src="9jv67a" fileName="components/Button122.xml" xy="922,415">
       <Button title="排行榜"/>
     </component>
-    <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">
+    <component id="n11_9jv6" name="comHead" src="wm603r" fileName="components/ComHeadIcon.xml" xy="238,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.玩法描述玩法描述玩法描述"/>
+    <image id="n12_9jv6" name="n12" src="wm6037" fileName="images/lm_db_touxiang.png" xy="81,113" group="n13_9jv6"/>
+    <image id="n14_9jv6" name="n14" src="9jv66m" fileName="images/lm_ch_dcm.png" xy="96,69" group="n13_9jv6"/>
+    <text id="n2_pvb4" name="txtName" xy="148,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="81,69" size="316,401"/>
+    <text id="n6_pvb4" name="txtRule" xy="386,198" size="602,289" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#a9733e" autoSize="none" text="1.每天19:10分开启雅集夜宴&#xD;&#xA;2.活动需要成员尽可能在10分钟内快速回答问题，每答对一题在场的所有成员均可获得一份奖励&#xD;&#xA;3.活动结束时按照全员答对题数，仍在场的成员还可获得一份额外大奖&#xD;&#xA;4.每个成员每道题目只有一次回答机会，请认真回答哦"/>
     <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>
     <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"/>
+    <text id="n15_9jv6" name="n15" xy="388,140" 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="377,192"/>
   </displayList>
 </component>

FGUIProject/assets/League/LeagueAnsweringUI.xml

@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
-  <controller name="ctrlHasIcon" pages="0,,1," selected="1">
+  <controller name="ctrlHasIcon" pages="0,,1," selected="0">
     <remark page="0" value="有图标"/>
     <remark page="1" value="无图标"/>
   </controller>
-  <controller name="ctrlQuestionState" pages="0,,1," selected="1">
+  <controller name="ctrlQuestionState" pages="0,,1," selected="0">
     <remark page="0" value="答题中"/>
     <remark page="1" value="cd中"/>
   </controller>
-  <controller name="ctrlQuestionType" pages="0,,1,,2," selected="2">
+  <controller name="ctrlQuestionType" pages="0,,1,,2," selected="0">
     <remark page="1" value="选择题"/>
     <remark page="2" value="填空题"/>
   </controller>
-  <controller name="ctrlResult" pages="0,,1,,2,,3," selected="2">
+  <controller name="ctrlResult" pages="0,,1,,2,,3," selected="1">
     <remark page="1" value="有人答对题目"/>
     <remark page="2" value="没人答对题目"/>
     <remark page="3" value="全部题目答完"/>
@@ -27,7 +27,7 @@
     <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"/>
+    <image id="n39_9jv6" name="n39" src="9jv66j" fileName="images/lm_zsx0.png" xy="170,128"/>
     <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>
@@ -35,14 +35,17 @@
     <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="435,128" size="210,42" font="ui://eg2y0ldpa0cftks" fontSize="30" color="#915e15" align="center" text="全员已答对10题"/>
+    <text id="n10_pvb4" name="txtRightCount" xy="435,128" size="196,42" font="ui://eg2y0ldpa0cftks" fontSize="30" color="#915e15" align="center" ubb="true" vars="true" text="全员已答对[color=#AF5638]{value=0}[/color]题">
+      <gearDisplay controller="ctrlQuestionState" pages="1"/>
+    </text>
+    <image id="n38_9jv6" name="n38" src="9jv66o" fileName="images/lm_djs_db.png" xy="935,0" group="n15_pvb4"/>
     <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="题目描述题目描述题目描述题目描述题目 描述题目描述题目描述题目描述题目题目 描述述?">
+    <text id="n13_pvb4" name="txtContent" xy="358,274" size="620,173" 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="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">
+    <list id="n14_pvb4" name="listResult" xy="359,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="359,515|227,515"/>
       <gearSize controller="ctrlHasIcon" pages="0,1" values="625,148,1,1|625,148,1,1"/>
@@ -51,26 +54,26 @@
       <item/>
       <item/>
     </list>
-    <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="请输入您的答案：">
+    <text id="n16_pvb4" name="n16" xy="360,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="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="                       ">
+    <text id="n17_pvb4" name="txtResult" xy="602,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="603,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="229,470" size="367,43" group="n15_pvb4" advanced="true">
+    <group id="n19_pvb4" name="n19" xy="360,470" size="367,43" group="n15_pvb4" advanced="true">
       <gearDisplay controller="ctrlQuestionType" pages=""/>
       <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题"/>
+    <text id="n40_9jv6" name="txtRightCount1" xy="58,667" size="184,42" group="n42_9jv6" font="ui://eg2y0ldpa0cftks" fontSize="30" color="#915e15" align="center" letterSpacing="-2" ubb="true" vars="true" text="全员已答对[color=#AF5638]{value=0}[/color]题"/>
     <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="15,124" size="1018,627" advanced="true">
+    <group id="n15_pvb4" name="n15" xy="15,0" size="1065,751" advanced="true">
       <gearDisplay controller="ctrlQuestionState" pages="0"/>
     </group>
     <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">
@@ -91,7 +94,7 @@
       <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="秒后开始下一题"/>
+    <text id="n23_pvb4" name="txtCdTime" xy="418,562" pivot="0.5,0" size="244,44" group="n54_miy3" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#915e15" align="center" ubb="true" vars="true" text="[color=#5EAE49]{value=0}[/color]秒后开始下一题"/>
     <group id="n54_miy3" name="n54" xy="162,562" size="756,44" group="n24_pvb4" advanced="true">
       <gearDisplay controller="ctrlResult" pages="1,2"/>
     </group>
@@ -108,17 +111,20 @@
       <item/>
     </list>
     <list id="n30_pvb4" name="listChat" xy="366,794" size="664,869" overflow="scroll" defaultItem="ui://tw70qm9dpvb456" autoClearItems="true">
+      <relation target="" sidePair="bottom-bottom"/>
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
-    <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">
+    <image id="n47_9jv6" name="n47" src="9jv667" fileName="images/lm_dt_srdb.png" xy="0,1665" group="n56_miy3"/>
+    <image id="n48_9jv6" name="n48" src="a0cf2g" fileName="images/lm_sousuok.png" xy="84,1779" group="n56_miy3"/>
+    <text id="n35_pvb4" name="txtChat" xy="110,1784" size="558,44" group="n56_miy3" 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" group="n56_miy3">
       <Button title="发送"/>
     </component>
-    <image id="n39_9jv6" name="n39" src="9jv66j" fileName="images/lm_zsx0.png" xy="170,128"/>
+    <group id="n56_miy3" name="n56" xy="0,1665" size="1080,255" advanced="true">
+      <relation target="" sidePair="bottom-bottom"/>
+    </group>
   </displayList>
 </component>

FGUIProject/assets/League/LeagueSkillUI.xml

@@ -4,20 +4,19 @@
     <loader id="n0_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="n9_miy3" name="n9" src="miy37l" fileName="images/lm_ch_jndb.png" xy="0,20">
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
+    <image id="n15_miy3" name="n15" src="9jv65o" fileName="images/lm_fl_db.png" xy="-31,21" size="1144,1898"/>
+    <image id="n16_miy3" name="n16" src="miy37f" fileName="images/lm_ch_zsx.png" xy="67,243"/>
     <component id="n3_pvb4" name="comValue" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" controller="c1,13"/>
     <component id="n1_pvb4" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80">
       <relation target="" sidePair="left-left,top-top"/>
     </component>
-    <list id="n4_pvb4" name="listScore" xy="106,140" size="868,109" layout="row" overflow="scroll" colGap="20" defaultItem="ui://tw70qm9dmiy37v" align="center" autoClearItems="true">
+    <list id="n4_pvb4" name="listScore" xy="106,188" size="868,109" layout="row" overflow="scroll" colGap="20" defaultItem="ui://tw70qm9dmiy37v" align="center" autoClearItems="true">
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
-    <list id="n8_pvb4" name="list" xy="56,276" size="931,1445" overflow="scroll" lineGap="15" defaultItem="ui://tw70qm9dpvb45b" align="center" autoClearItems="true">
+    <list id="n8_pvb4" name="list" xy="56,323" size="931,1398" overflow="scroll" lineGap="15" defaultItem="ui://tw70qm9dpvb45b" align="center" autoClearItems="true">
       <relation target="" sidePair="bottomext-bottom"/>
       <item/>
       <item/>

FGUIProject/assets/League/components/ListRankItem.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="918,131">
-  <controller name="c1" pages="0,,1,,2,,3," selected="1"/>
-  <controller name="c2" exported="true" pages="0,,1," selected="1">
+  <controller name="c1" pages="0,,1,,2,,3," selected="0"/>
+  <controller name="c2" exported="true" pages="0,,1," selected="0">
     <remark page="0" value="别人"/>
     <remark page="1" value="自己"/>
   </controller>
@@ -12,19 +12,19 @@
     <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">
+    <loader id="n19_pvb4" name="loaRank" xy="37,14" size="83,83" group="n25_9jv6" url="ui://tw70qm9d9jv65x" 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="57,24" pivot="0.5,0" size="48,62" group="n25_9jv6" font="ui://eg2y0ldpa0cftks" fontSize="46" color="#96716d" text="10">
+    <text id="n20_pvb4" name="txtRank" xy="57,24" pivot="0.5,0" size="48,61" 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="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">
+    <loader id="n23_pvb4" name="loatitle" xy="260,67" size="117,28" group="n25_9jv6" url="ui://tw70qm9d9jv66k" 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题"/>
+    <text id="n24_pvb4" name="txtContent" xy="748,45" pivot="0.5,0" size="116,44" group="n25_9jv6" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#956837" align="center" ubb="true" vars="true" text="答对[color=#DE5F2D]{value=0}[/color]题"/>
     <group id="n25_9jv6" name="n25" xy="37,-59" size="843,230"/>
   </displayList>
 </component>

FGUIProject/assets/League/components/ListSkillItem.xml

@@ -12,7 +12,7 @@
     <group id="n13_pvb4" name="n13" xy="28,0" size="105,50"/>
     <image id="n17_gfx4" name="imgLock" src="miy37h" fileName="images/lm_ch_wdl_zz.png" xy="-6,-6" group="n22_miy3"/>
     <image id="n21_miy3" name="n21" src="miy37t" fileName="imagesNew/tb_suo.png" pkg="eg2y0ldp" xy="59,75" group="n22_miy3"/>
-    <group id="n22_miy3" name="n22" xy="-6,-6" size="175,174" advanced="true">
+    <group id="n22_miy3" name="grpLock" xy="-6,-6" size="175,174" advanced="true">
       <gearDisplay controller="c1" pages="0"/>
     </group>
     <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"/>

FGUIProject/assets/League/package.xml

@@ -209,7 +209,6 @@
     <image id="miy37i" name="lm_ch_szdk.png" path="/images/"/>
     <image id="miy37j" name="lm_ch_mcdb.png" path="/images/"/>
     <image id="miy37k" name="lm_hdgz_zsx.png" path="/images/"/>
-    <image id="miy37l" name="lm_ch_jndb.png" path="/images/"/>
     <image id="miy37m" name="lm_ch_fy_an.png" path="/images/"/>
     <image id="miy37n" name="lm_ch_dldb.png" path="/images/"/>
     <image id="miy37o" name="lm_ch_dbzz.png" path="/images/"/>

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

@@ -12,6 +12,7 @@ namespace UI.League
         public GLoader m_loaScore;
         public GTextField m_txtScore;
         public GImage m_imgLock;
+        public GGroup m_grpLock;
         public GComponent m_comCost;
         public const string URL = "ui://tw70qm9dpvb45d";
         public const string PACKAGE_NAME = "League";
@@ -65,6 +66,7 @@ namespace UI.League
             m_loaScore = (GLoader)comp.GetChild("loaScore");
             m_txtScore = (GTextField)comp.GetChild("txtScore");
             m_imgLock = (GImage)comp.GetChild("imgLock");
+            m_grpLock = (GGroup)comp.GetChild("grpLock");
             m_comCost = (GComponent)comp.GetChild("comCost");
         }
         public void Dispose(bool disposeTarget = false)
@@ -74,6 +76,7 @@ namespace UI.League
             m_loaScore = null;
             m_txtScore = null;
             m_imgLock = null;
+            m_grpLock = null;
             m_comCost = null;
             if(disposeTarget && target != null)
             {

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

@@ -66,7 +66,7 @@ namespace GFGGame
             if (_ui.m_c1.selectedIndex == 1)
             {
                 if (LeagueDataManager.Instance.GetNumeriValue(LeagueNumericType.LeagueQuestionStatus) == LeagueQuestionStatus.End
-                && LeagueDataManager.Instance.ListAnswerRankDatas[_ui.m_c1.selectedIndex].Count == 0
+                && LeagueDataManager.Instance.ListAnswerRankDatas.ContainsKey(_ui.m_c1.selectedIndex)
                 || LeagueDataManager.Instance.GetNumeriValue(LeagueNumericType.LeagueQuestionStatus) > LeagueQuestionStatus.End)
                 {
                     await LeagueSproxy.ReqGetAnswerRank(_ui.m_c1.selectedIndex);
@@ -75,7 +75,7 @@ namespace GFGGame
             }
             else if (_ui.m_c1.selectedIndex == 2)
             {
-                if (LeagueDataManager.Instance.ListAnswerRankDatas[_ui.m_c1.selectedIndex].Count == 0)
+                if (!LeagueDataManager.Instance.ListAnswerRankDatas.ContainsKey(_ui.m_c1.selectedIndex))
                 {
                     await LeagueSproxy.ReqGetAnswerRank(_ui.m_c1.selectedIndex);
                 }
@@ -85,6 +85,7 @@ namespace GFGGame
         private void UpdateView()
         {
             _ui.m_list.numItems = LeagueDataManager.Instance.ListAnswerRankDatas[_ui.m_c1.selectedIndex].Count;
+            UpdateItem(_myIndex, _ui.m_comMine.target, true);
         }
 
         private void RenderListItem(int index, GObject obj)
@@ -97,17 +98,20 @@ namespace GFGGame
             UI_ListRankItem item = UI_ListRankItem.Proxy(obj);
             if (isMine)
             {
-                RoleInfoManager.Instance.UpdateHeadWithLv(item.target, RoleDataManager.headId, RoleDataManager.headBorderId, RoleDataManager.lvl);
+                RoleInfoManager.Instance.UpdateHeadWithLv(item.m_comHead, RoleDataManager.headId, RoleDataManager.headBorderId, RoleDataManager.lvl);
+                item.m_txtName.text = RoleDataManager.roleName;
+
             }
             else
             {
                 OtherRoleInfoData roleInfoData = LeagueDataManager.Instance.LeagueData.LeagueMemberDatas[answerData.RoleId].RoleInfo;
-                RoleInfoManager.Instance.UpdateHeadWithLv(item.target, roleInfoData.headId, roleInfoData.headBorderId, roleInfoData.roleLv);
+                RoleInfoManager.Instance.UpdateHeadWithLv(item.m_comHead, roleInfoData.headId, roleInfoData.headBorderId, roleInfoData.roleLv);
+                item.m_txtName.text = answerData == null ? "--" : LeagueDataManager.Instance.GetMemberRoleInfo(answerData.RoleId).roleName;
             }
             int rank = index + 1;
             item.m_txtRank.text = answerData == null ? "--" : rank.ToString();
-            item.m_c1.selectedIndex = answerData != null && rank <= 3 ? rank : 0;
-            item.m_txtRank.text = string.Format("答对{0}题", answerData == null ? 0 : answerData.Num);
+            item.m_c1.selectedIndex = answerData != null && rank <= 3 ? rank : 3;
+            item.m_txtContent.SetVar("value", answerData == null ? "0" : answerData.Num.ToString()).FlushVars();
             UI_ListRankItem.ProxyEnd();
         }
     }

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

@@ -63,14 +63,20 @@ namespace GFGGame
         }
         private void OnBtnAnswerClick()
         {
-            ViewManager.Show<LeagueAnsweringView>(null, new object[] { typeof(LeagueAnsweringView).FullName });
+            ViewManager.Show<LeagueAnsweringView>(null, new object[] { typeof(LeagueAnswerView).FullName });
         }
 
         private void UpdateView()
         {
-            OtherRoleInfoData roleInfo = LeagueDataManager.Instance.LeagueData.LeagueMemberDatas[LeagueDataManager.Instance.LeagueData.LastWeekAnswerNO1Id].RoleInfo;
-            // RoleInfoManager.Instance.UpdateHead(_ui.m_comHead, roleInfo.headId, roleInfo.headBorderId);
-            _ui.m_txtName.text = roleInfo.roleName;
+
+            OtherRoleInfoData lastNO1 = LeagueDataManager.Instance.GetMemberRoleInfo(LeagueDataManager.Instance.LeagueData.LastWeekAnswerNO1Id);
+            _ui.m_comHead.target.visible = false;
+            if (lastNO1 != null)
+            {
+                ItemCfg headCfg = ItemCfgArray.Instance.GetCfg(lastNO1.headId == 0 ? ConstItemID.HEADID : lastNO1.headId);
+                _ui.m_comHead.m_loaIcon.url = ResPathUtil.GetHeadPath(headCfg.res);
+            }
+            _ui.m_txtName.text = lastNO1 == null ? "虚位以待" : lastNO1.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

@@ -58,9 +58,9 @@ namespace GFGGame
         {
             base.OnShown();
             _dataManager = LeagueDataManager.Instance;
-            _ui.m_listChat.numItems = ChatDataManager.Instance.ChatDatas[ChatType.LeagueQuestion].Count;
+            _ui.m_listChat.numItems = ChatDataManager.Instance.ChatDatas.ContainsKey(ChatType.LeagueQuestion) ? ChatDataManager.Instance.ChatDatas[ChatType.LeagueQuestion].Count : 0;
             _ui.m_listChat.scrollPane.ScrollBottom();
-
+            UpdateQuestionState();
             bool result = await LeagueSproxy.ReqJoinAnswer();
             if (result)
             {
@@ -105,7 +105,9 @@ namespace GFGGame
         }
         private void UpdateQuestion()
         {
-            _ui.m_txtRightCount.text = string.Format("全员已答对{0}题", _dataManager.GetNumeriValue(LeagueNumericType.LeagueQuestionTrueCount));
+            // _ui.m_txtRightCount.text = string.Format("全员已答对{0}题", _dataManager.GetNumeriValue(LeagueNumericType.LeagueQuestionTrueCount));
+            _ui.m_txtRightCount.SetVar("value", _dataManager.GetNumeriValue(LeagueNumericType.LeagueQuestionTrueCount).ToString());
+            _ui.m_txtRightCount1.SetVar("value", _dataManager.GetNumeriValue(LeagueNumericType.LeagueQuestionTrueCount).ToString());
             _ui.m_ctrlQuestionState.selectedIndex = 0;
             int questionId = (int)_dataManager.GetNumeriValue(LeagueNumericType.LeagueQuestionId);
             LeagueQuestionCfg questionCfg = LeagueQuestionCfgArray.Instance.GetCfg(questionId);
@@ -143,7 +145,10 @@ namespace GFGGame
         }
         private void UpdateResult()
         {
-            _ui.m_txtRightCount.text = string.Format("全员已答对{0}题", _dataManager.GetNumeriValue(LeagueNumericType.LeagueQuestionTrueCount));
+            // _ui.m_txtRightCount.text = string.Format("全员已答对{0}题", _dataManager.GetNumeriValue(LeagueNumericType.LeagueQuestionTrueCount));
+            // _ui.txtRightCount1.text = string.Format("全员已答对{0}题", _dataManager.GetNumeriValue(LeagueNumericType.LeagueQuestionTrueCount));
+            _ui.m_txtRightCount.SetVar("value", _dataManager.GetNumeriValue(LeagueNumericType.LeagueQuestionTrueCount).ToString());
+            _ui.m_txtRightCount1.SetVar("value", _dataManager.GetNumeriValue(LeagueNumericType.LeagueQuestionTrueCount).ToString());
             _ui.m_ctrlQuestionState.selectedIndex = 1;
             _ui.m_ctrlResult.selectedIndex = LastQuestionResult.SomeBodyRight;
             if (_dataManager.LastAnswerRoleData.LastQuestionResult == LastQuestionResult.SomeBodyRight)
@@ -189,12 +194,15 @@ namespace GFGGame
                 Timers.inst.Remove(UpdateResultTime);
                 return;
             }
-            _ui.m_txtTime.text = (endTime - curTime) / 1000 + "秒后开始下一题";
+            // _ui.m_txtTime.text = (endTime - curTime) / 1000 + "秒后开始下一题";
+            _ui.m_txtTime.SetVar("value", ((endTime - curTime) / 1000).ToString());
+
         }
         private void UpdateJoinList()
         {
             _memberIds = new List<long>(_dataManager.ListAnsweringDatas.Keys);
             _ui.m_listJoin.numItems = _memberIds.Count;
+            _ui.m_txtJoinNum.text = string.Format("当前参与人员：{0}/{1}", _memberIds.Count, _dataManager.LeagueData.LeagueMemberDatas.Count);
         }
         private void UpdateChatList()
         {
@@ -248,7 +256,7 @@ namespace GFGGame
             UI_ListAnswerJoinItem item = UI_ListAnswerJoinItem.Proxy(obj);
             RoleInfoManager.Instance.UpdateHead(item.m_comHead, roleInfo.headId, roleInfo.headBorderId);
             item.m_txtName.text = roleInfo.roleName;
-            item.m_txtAnswerCount.text = string.Format("答对数量：{0}", _dataManager.ListAnsweringDatas[roleInfo.roleId]);
+            item.m_txtAnswerCount.text = _dataManager.ListAnsweringDatas[roleInfo.roleId].ToString();
             UI_ListAnswerJoinItem.ProxyEnd();
         }
         private void RenderListChatItem(int index, GObject obj)

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

@@ -42,12 +42,13 @@ namespace GFGGame
             _ui.m_listScore.itemRenderer = RenderListScoreItem;
             _ui.m_list.itemRenderer = RenderListItem;
             _ui.m_list.SetVirtual();
+            _ui.m_list.scrollPane.decelerationRate = 0.8f;
             _ui.m_btnLeft.onClick.Add(OnBtnLeftClick);
             _ui.m_btnRight.onClick.Add(OnBtnRightClick);
 
             _valueBarController = new ValueBarController(_ui.m_comValue);
 
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("lm_beijing");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("lm_ch_jnbg");
         }
         protected override void AddEventListener()
         {
@@ -62,7 +63,14 @@ namespace GFGGame
             _ui.m_list.numItems = LeagueSkillCountCfgArray.Instance.GetCfg(_type).layerCount;
             if (LeagueDataManager.Instance.GetSkillProgressByType(_type) < 100 && LeagueDataManager.Instance.GetSkillProgressByType(_type) > 0)
             {
-                _ui.m_list.ScrollToView(LeagueDataManager.Instance.CurLayer - 1);
+                if (LeagueDataManager.Instance.CurLayer == _ui.m_list.numItems)
+                {
+                    _ui.m_list.ScrollToView(LeagueDataManager.Instance.CurLayer - 1);
+                }
+                else
+                {
+                    _ui.m_list.ScrollToView(LeagueDataManager.Instance.CurLayer);
+                }
             }
             // _pageCount = Math.Ceiling((double)(_ui.m_list.scrollPane.contentWidth / _ui.m_list.scrollPane.viewWidth));
             UpdateView();
@@ -89,8 +97,10 @@ namespace GFGGame
             int index = _ui.m_list.GetFirstChildInView();
             int curPage = index / _ui.m_list.lineCount;
             int nextPage = curPage + 1;
-            if (nextPage * _ui.m_list.lineCount > _ui.m_list.numItems) return;
-            _ui.m_list.ScrollToView(nextPage * _ui.m_list.lineCount);
+            if (nextPage * _ui.m_list.lineCount > _ui.m_list.numItems - 1) return;
+            _ui.m_list.ScrollToView(nextPage * _ui.m_list.lineCount, true);
+            Debug.Log("curPage:" + nextPage);
+
         }
         private void OnBtnLeftClick()
         {
@@ -98,7 +108,9 @@ namespace GFGGame
             int curPage = index / _ui.m_list.lineCount;
             int lastPage = curPage - 1;
             if (lastPage * _ui.m_list.lineCount < 0) return;
-            _ui.m_list.ScrollToView(lastPage * _ui.m_list.lineCount);
+            _ui.m_list.ScrollToView(lastPage * _ui.m_list.lineCount, true);
+            Debug.Log("curPage:" + lastPage);
+
         }
         private void UpdateView()
         {
@@ -135,10 +147,10 @@ namespace GFGGame
             List<LeagueSkillCfg> skillCfgs = obj.parent.data as List<LeagueSkillCfg>;
             UI_ListSkillItem item = UI_ListSkillItem.Proxy(obj);
             item.m_loaScore.url = ResPathUtil.GetScorePath(skillCfgs[index].score);
-            item.m_txtScore.text = skillCfgs[index].value.ToString();
+            item.m_txtScore.text = "+" + skillCfgs[index].value.ToString();
             bool isLock = !SkillDataManager.Instance.LeagueSkillDatas.ContainsKey(_type) || SkillDataManager.Instance.LeagueSkillDatas[_type].IndexOf(skillCfgs[index].id) < 0;
-            item.m_imgLock.visible = isLock;
-            ItemUtil.UpdateItemNeedNum(item.m_comCost, skillCfgs[index].consumeArr[0], true);
+            item.m_grpLock.visible = isLock;
+            ItemUtil.UpdateItemNeedNum(item.m_comCost, skillCfgs[index].consumeArr[0], false, "#FFFBF4");
             if (item.target.data == null)
             {
                 item.target.onClick.Add(OnActiveSkill);

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

@@ -41,7 +41,7 @@ namespace GFGGame
 
             _valueBarController = new ValueBarController(_ui.m_comValue);
 
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("lm_beijing");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("lm_beijing2");
         }
         protected override void AddEventListener()
         {
@@ -93,17 +93,19 @@ namespace GFGGame
             LeagueSkillCountCfg skillCountCfg = LeagueSkillCountCfgArray.Instance.dataArray[index];
             UI_ListSkillTypeItem item = UI_ListSkillTypeItem.Proxy(obj);
             int maxFinishType = LeagueDataManager.Instance.MaxFinishType;
-            if (skillCountCfg.type <= maxFinishType + 1)
-            {
-                item.m_txtTitle.text = string.Format("茶艺-{0}", skillCountCfg.name);
-            }
-            else
-            {
-                LeagueSkillCountCfg lastSkillCountCfg = LeagueSkillCountCfgArray.Instance.dataArray[index - 1];
-                item.m_txtTitle.text = string.Format("学习完茶艺-{0}后开启", lastSkillCountCfg.name);
-            }
+            // if (skillCountCfg.type <= maxFinishType + 1)
+            // {
+            item.m_txtTitle.text = string.Format("茶艺·{0}", skillCountCfg.name);
+            // }
+            // else
+            // {
+            //     LeagueSkillCountCfg lastSkillCountCfg = LeagueSkillCountCfgArray.Instance.dataArray[index - 1];
+            //     item.m_txtTitle.text = string.Format("学习完茶艺-{0}后开启", lastSkillCountCfg.name);
+            // }
+            item.m_grpLock.visible = skillCountCfg.type > maxFinishType + 1;
             double progress = LeagueDataManager.Instance.GetSkillProgressByType(skillCountCfg.type);
-            item.m_txtProgress.text = string.Format("进度{0}%", progress);
+            // item.m_txtProgress.text = string.Format("进度{0}%", progress);
+            item.m_txtProgress.SetVar("value", progress.ToString()).FlushVars();
             // item.m_txtProgress.text = LeagueDataManager.Instance.GetSkillProgressByType(skillCountCfg.type).ToString();
             if (item.target.data == null)
             {

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

@@ -51,6 +51,9 @@ namespace GFGGame
             int myPos = LeagueDataManager.Instance.GetMyPos();
             _ui.m_btnChangeNotice.visible = myPos == LeaguePos.Owner || myPos == LeaguePos.SubOwner;
             UpdateView();
+
+            ChatSProxy.ReqQueryChatMsg(ChatType.League).Coroutine();
+            ChatSProxy.ReqQueryChatMsg(ChatType.LeagueQuestion).Coroutine();
         }
 
         protected override void OnHide()

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

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: a92b851026bce4249a1e54f43a63f309
-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_10.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: dba8c30229aa9354d806753c34a175ba
-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: