zhaoyang 2 gadi atpakaļ
vecāks
revīzija
721cc047d3

+ 7 - 5
FGUIProject/assets/League/LeagueAnsweringUI.xml

@@ -8,11 +8,11 @@
     <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="1">
     <remark page="1" value="选择题"/>
     <remark page="2" value="填空题"/>
   </controller>
-  <controller name="ctrlResult" pages="0,,1,,2,,3," selected="0">
+  <controller name="ctrlResult" pages="0,,1,,2,,3," selected="1">
     <remark page="1" value="有人答对题目"/>
     <remark page="2" value="没人答对题目"/>
     <remark page="3" value="全部题目答完"/>
@@ -58,13 +58,15 @@
       <item/>
       <item/>
     </list>
-    <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="请输入您的答案:">
+    <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="602,470" size="271,42" group="n19_pvb4" font="ui://eg2y0ldpa0cftks" fontSize="30" color="#b68f52" align="center" autoSize="none" text="" input="true" prompt="[color=#A7957E]点此输入答案[/color]">
       <gearDisplay controller="ctrlQuestionType" pages="2"/>
     </text>
-    <graph id="n62_t6j1" name="n62" xy="607,509" size="269,2" group="n19_pvb4" type="rect" lineSize="0" fillColor="#ffb68f52"/>
+    <graph id="n62_t6j1" name="n62" xy="607,509" size="269,2" group="n19_pvb4" type="rect" lineSize="0" fillColor="#ffb68f52">
+      <gearDisplay controller="ctrlQuestionType" pages="2"/>
+    </graph>
     <group id="n19_pvb4" name="n19" xy="360,470" size="516,43" group="n15_pvb4" advanced="true">
       <gearDisplay controller="ctrlQuestionType" pages=""/>
       <gearXY controller="ctrlHasIcon" pages="0,1" values="360,470|229,470"/>
@@ -92,7 +94,7 @@
     <image id="n55_miy3" name="n55" src="9jv65l" fileName="images/lm_dt_tsdk.png" xy="110,424" group="n24_pvb4">
       <gearDisplay controller="ctrlResult" pages="3"/>
     </image>
-    <text id="n22_pvb4" name="txtInfo" xy="539,514" pivot="0.5,0" anchor="true" size="245,44" group="n24_pvb4" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#915e15" align="center" text="全部题目答完啦~">
+    <text id="n22_pvb4" name="txtInfo" xy="539,560" pivot="0.5,0" anchor="true" size="245,44" group="n24_pvb4" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#915e15" align="center" text="全部题目答完啦~">
       <gearXY controller="ctrlResult" pages="0,1,2,3" values="539,514|539,560|539,560|539,417"/>
     </text>
     <image id="n53_miy3" name="n53" src="9jv65l" fileName="images/lm_dt_tsdk.png" xy="110,614" group="n54_miy3"/>

+ 2 - 2
FGUIProject/assets/League/package.xml

@@ -159,8 +159,8 @@
     <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/" 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="9jv66t" name="lm_dt_dhdk.png" path="/images/" scale="9grid" scale9grid="23,24,226,11"/>
+    <image id="9jv66u" name="lm_dt_dhdk2.png" path="/images/" scale="9grid" scale9grid="9,27,366,36"/>
     <image id="9jv66v" name="lm_bq_xcm.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"/>

+ 2 - 1
GameClient/Assets/Game/HotUpdate/Views/League/LeagueAnsweringView.cs

@@ -224,7 +224,8 @@ namespace GFGGame
                 _ui.m_comRightHead.target.visible = true;
                 _ui.m_imgFail.visible = false;
                 OtherRoleInfoData roleInfoData = _dataManager.GetMemberRoleInfo(_dataManager.LastAnswerRoleData.RightRoleId);
-                RoleInfoManager.Instance.UpdateHeadWithLv(_ui.m_comRightHead.target, roleInfoData.headId, roleInfoData.headBorderId, roleInfoData.roleLv);
+                ItemCfg headCfg = ItemCfgArray.Instance.GetCfg(roleInfoData.headId == 0 ? ConstItemID.HEADID : roleInfoData.headId);
+                _ui.m_comRightHead.m_loaIcon.url = ResPathUtil.GetHeadPath(headCfg.res);
                 _ui.m_txtInfo.text = string.Format("{0} 答对了!", roleInfoData.roleName);
                 _ui.m_holderHead.visible = true;
                 Timers.inst.Remove(UpdateResultTime);

BIN
GameClient/Assets/ResIn/UI/League/League_fui.bytes