zhaoyang 2 years ago
parent
commit
6ee26122c1

+ 8 - 8
FGUIProject/assets/League/LeagueAnsweringUI.xml

@@ -12,7 +12,7 @@
     <remark page="1" value="选择题"/>
     <remark page="1" value="选择题"/>
     <remark page="2" value="填空题"/>
     <remark page="2" value="填空题"/>
   </controller>
   </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="1" value="有人答对题目"/>
     <remark page="2" value="没人答对题目"/>
     <remark page="2" value="没人答对题目"/>
     <remark page="3" value="全部题目答完"/>
     <remark page="3" value="全部题目答完"/>
@@ -89,22 +89,22 @@
     <image id="n21_pvb4" name="imgFail" src="9jv66a" fileName="images/fannao.png" xy="394,169" group="n24_pvb4">
     <image id="n21_pvb4" name="imgFail" src="9jv66a" fileName="images/fannao.png" xy="394,169" group="n24_pvb4">
       <gearDisplay controller="ctrlResult" pages="2"/>
       <gearDisplay controller="ctrlResult" pages="2"/>
     </image>
     </image>
-    <image id="n55_miy3" name="n55" src="9jv65l" fileName="images/lm_dt_tsdk.png" xy="162,424" group="n24_pvb4">
+    <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"/>
       <gearDisplay controller="ctrlResult" pages="3"/>
     </image>
     </image>
-    <text id="n22_pvb4" name="txtInfo" xy="539,514" pivot="0.5,0" anchor="true" size="469,44" group="n24_pvb4" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#915e15" align="center" text="哎呀,没人答对呀,大家加油鸭~">
+    <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="全部题目答完啦~">
       <gearXY controller="ctrlResult" pages="0,1,2,3" values="539,514|539,514|539,514|539,417"/>
       <gearXY controller="ctrlResult" pages="0,1,2,3" values="539,514|539,514|539,514|539,417"/>
     </text>
     </text>
-    <image id="n53_miy3" name="n53" src="9jv65l" fileName="images/lm_dt_tsdk.png" xy="162,568" group="n54_miy3"/>
+    <image id="n53_miy3" name="n53" src="9jv65l" fileName="images/lm_dt_tsdk.png" xy="110,568" group="n54_miy3"/>
     <text id="n23_pvb4" name="txtCdTime" xy="410,562" pivot="0.5,0" size="259,44" group="n54_miy3" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#915e15" align="center" ubb="true" vars="true" text="[color=#5EAE49]{value=10}[/color]秒后开始下一题"/>
     <text id="n23_pvb4" name="txtCdTime" xy="410,562" pivot="0.5,0" size="259,44" group="n54_miy3" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#915e15" align="center" ubb="true" vars="true" text="[color=#5EAE49]{value=10}[/color]秒后开始下一题"/>
-    <group id="n54_miy3" name="n54" xy="162,562" size="756,44" group="n24_pvb4" advanced="true">
+    <group id="n54_miy3" name="n54" xy="110,562" size="756,44" group="n24_pvb4" advanced="true">
       <gearDisplay controller="ctrlResult" pages="1,2"/>
       <gearDisplay controller="ctrlResult" pages="1,2"/>
     </group>
     </group>
-    <group id="n24_pvb4" name="n24" xy="162,169" size="756,437" advanced="true">
+    <group id="n24_pvb4" name="n24" xy="110,169" size="756,437" advanced="true">
       <gearDisplay controller="ctrlQuestionState" pages="1"/>
       <gearDisplay controller="ctrlQuestionState" pages="1"/>
     </group>
     </group>
     <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"/>
     <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">
+    <list id="n26_pvb4" name="listJoin" xy="42,793" size="307,944" overflow="scroll" defaultItem="ui://tw70qm9dpvb455" autoClearItems="true">
       <relation target="" sidePair="bottomext-bottom"/>
       <relation target="" sidePair="bottomext-bottom"/>
       <item/>
       <item/>
       <item/>
       <item/>
@@ -112,7 +112,7 @@
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
     </list>
-    <list id="n30_pvb4" name="listChat" xy="366,794" size="664,869" overflow="scroll" defaultItem="ui://tw70qm9dpvb456" autoClearItems="true">
+    <list id="n30_pvb4" name="listChat" xy="366,794" size="670,941" overflow="scroll" defaultItem="ui://tw70qm9dpvb456" autoClearItems="true">
       <relation target="" sidePair="bottomext-bottom"/>
       <relation target="" sidePair="bottomext-bottom"/>
       <item/>
       <item/>
       <item/>
       <item/>

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

@@ -8,7 +8,7 @@
     <component id="n1_u2u3" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80">
     <component id="n1_u2u3" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80">
       <relation target="" sidePair="left-left,top-top"/>
       <relation target="" sidePair="left-left,top-top"/>
     </component>
     </component>
-    <component id="n22_a0cf" name="btnRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="296,88" size="36,37">
+    <component id="n22_a0cf" name="btnRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="296,88" size="36,37" visible="false">
       <Button icon="ui://tw70qm9do9gh4b"/>
       <Button icon="ui://tw70qm9do9gh4b"/>
     </component>
     </component>
     <component id="n18_u2u3" name="btnMember" src="u2u31b" fileName="components/Button3.xml" xy="770,81" size="168,61" controller="c1,1">
     <component id="n18_u2u3" name="btnMember" src="u2u31b" fileName="components/Button3.xml" xy="770,81" size="168,61" controller="c1,1">
@@ -17,7 +17,7 @@
     <component id="n19_u2u3" name="btnConstruct" src="u2u31b" fileName="components/Button3.xml" xy="346,81" controller="c1,0">
     <component id="n19_u2u3" name="btnConstruct" src="u2u31b" fileName="components/Button3.xml" xy="346,81" controller="c1,0">
       <Button title="雅集建设"/>
       <Button title="雅集建设"/>
     </component>
     </component>
-    <text id="n30_gfx4" name="txtLowKeep" xy="775,160" pivot="1,0" size="257,42" fontSize="30" align="right" text="已连续低维护:1天"/>
+    <text id="n30_gfx4" name="txtLowKeep" xy="777,160" pivot="1,0" size="255,42" font="ui://eg2y0ldpa0cftks" fontSize="30" color="#ff0000" align="right" text="已连续低维护:1天"/>
     <text id="n10_u2u3" name="txtUnionName" xy="250,317" pivot="0.5,0" size="212,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#fff6dc" align="center" autoClearText="true" text="联盟名字7个字"/>
     <text id="n10_u2u3" name="txtUnionName" xy="250,317" pivot="0.5,0" size="212,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#fff6dc" align="center" autoClearText="true" text="联盟名字7个字"/>
     <component id="n20_a0cf" name="comLeagueHead" src="a0cf30" fileName="components/ComLeagueHead.xml" xy="109,267"/>
     <component id="n20_a0cf" name="comLeagueHead" src="a0cf30" fileName="components/ComLeagueHead.xml" xy="109,267"/>
     <image id="n25_o9gh" name="n25" src="o9gh47" fileName="images/lm_zjm_gonggao.png" xy="599,308" size="444,136" group="n26_o9gh">
     <image id="n25_o9gh" name="n25" src="o9gh47" fileName="images/lm_zjm_gonggao.png" xy="599,308" size="444,136" group="n26_o9gh">

+ 4 - 4
FGUIProject/assets/League/components/ListChatItem.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
-<component size="485,155">
+<component size="670,155">
   <displayList>
   <displayList>
     <component id="n31_pvb4" name="comHead" src="o9ghtlp" fileName="components/ComHeadWithLv2.xml" pkg="eg2y0ldp" xy="0,0" size="230,218" scale="0.5,0.5">
     <component id="n31_pvb4" name="comHead" src="o9ghtlp" fileName="components/ComHeadWithLv2.xml" pkg="eg2y0ldp" xy="0,0" size="230,218" scale="0.5,0.5">
       <relation target="" sidePair="height-height,left-left"/>
       <relation target="" sidePair="height-height,left-left"/>
@@ -9,11 +9,11 @@
     <group id="n37_pvb4" name="n37" xy="113,20" size="288,35" advanced="true" layout="hz" colGap="5" excludeInvisibles="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"/>
       <relation target="" sidePair="left-left"/>
     </group>
     </group>
-    <image id="n35_pvb4" name="n35" src="9jv66t" fileName="images/lm_dt_dhdk.png" xy="113,62" size="367,84" group="n38_9jv6">
+    <image id="n35_pvb4" name="n35" src="9jv66t" fileName="images/lm_dt_dhdk.png" xy="113,62" size="389,84" group="n38_9jv6">
       <relation target="n34_pvb4" sidePair="width-width,height-height"/>
       <relation target="n34_pvb4" sidePair="width-width,height-height"/>
     </image>
     </image>
-    <text id="n34_pvb4" name="txtChatContent" xy="145,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"/>
+    <text id="n34_pvb4" name="txtChatContent" xy="145,66" size="340,73" group="n38_9jv6" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#915e15" leading="0" ubb="true" vars="true" autoClearText="true" text="玩家发言内容玩家发言内容&#xA;玩家发言\n内容玩家"/>
+    <group id="n38_9jv6" name="n38" xy="113,62" size="389,84"/>
   </displayList>
   </displayList>
   <relation target="n34_pvb4" sidePair="height-height"/>
   <relation target="n34_pvb4" sidePair="height-height"/>
 </component>
 </component>

+ 9 - 9
FGUIProject/assets/League/components/ListChatItemMine.xml

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

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Data/VO/LeagueData.cs

@@ -64,7 +64,7 @@ namespace GFGGame
     public class LeagueLastAnswerRoleData
     public class LeagueLastAnswerRoleData
     {
     {
         public long RightRoleId;//上题答对玩家Id
         public long RightRoleId;//上题答对玩家Id
-        public int LastQuestionResult;//上题回答结果1:有人答对题目 2:无人答对 3:答题结束
+        public int LastQuestionResult = 3;//上题回答结果1:有人答对题目 2:无人答对 3:答题结束
         public int LastQuestionId;//上题id
         public int LastQuestionId;//上题id
         public string MyAnswer;//我上题的答案
         public string MyAnswer;//我上题的答案
     }
     }

+ 8 - 1
GameClient/Assets/Game/HotUpdate/ServerProxy/ChatSProxy.cs

@@ -12,7 +12,14 @@ namespace ET
             chatData.Type = message.Type;
             chatData.Type = message.Type;
             chatData.RoleInfo = RoleDataManager.GetOtherRoleInfoData(message.RoleInfo);
             chatData.RoleInfo = RoleDataManager.GetOtherRoleInfoData(message.RoleInfo);
             chatData.TargetId = chatData.RoleInfo.roleId;
             chatData.TargetId = chatData.RoleInfo.roleId;
-            chatData.Content = message.Content;
+            string content = "";
+            for (int i = 0; i < message.Content.Length; i++)
+            {
+                string str = i > 0 && (i + 1) % 12 == 0 ? message.Content[i] + "\n" : message.Content[i].ToString();
+                content += str;
+            }
+            chatData.Content = content;
+
             chatData.Time = message.Time;
             chatData.Time = message.Time;
 
 
             if (chatData.Type == ChatType.Private)
             if (chatData.Type == ChatType.Private)

+ 5 - 1
GameClient/Assets/Game/HotUpdate/ServerProxy/LeagueSproxy.cs

@@ -232,7 +232,11 @@ namespace GFGGame
         {
         {
             LeagueDataManager.Instance.ListAnsweringDatas[message.RoleId] = message.Num;
             LeagueDataManager.Instance.ListAnsweringDatas[message.RoleId] = message.Num;
             LeagueDataManager.Instance.LastAnswerRoleData.RightRoleId = message.RoleId;
             LeagueDataManager.Instance.LastAnswerRoleData.RightRoleId = message.RoleId;
-
+            List<ItemData> rewards = ItemUtil.CreateItemDataList(message.Rewards);
+            if (rewards.Count > 0)
+            {
+                BonusController.TryShowBonusList(rewards);
+            }
             EventAgent.DispatchEvent(ConstMessage.LEAGUE_ANSWER_RESULT_CHANGE);
             EventAgent.DispatchEvent(ConstMessage.LEAGUE_ANSWER_RESULT_CHANGE);
             await ETTask.CompletedTask;
             await ETTask.CompletedTask;
         }
         }

+ 2 - 1
GameClient/Assets/Game/HotUpdate/Views/DailyTask/TaskView.cs

@@ -68,12 +68,13 @@ namespace GFGGame
         {
         {
             if (_ui.m_c1.selectedIndex == 1)
             if (_ui.m_c1.selectedIndex == 1)
             {
             {
-                //  ViewManager.Show<DailyTaskView>()
+                ViewManager.Show<DailyTaskView>();
             }
             }
             else if (_ui.m_c1.selectedIndex == 2)
             else if (_ui.m_c1.selectedIndex == 2)
             {
             {
 
 
             }
             }
+            this.viewData = null;
         }
         }
     }
     }
 }
 }

+ 9 - 4
GameClient/Assets/Game/HotUpdate/Views/League/LeagueAnswerRankView.cs

@@ -63,6 +63,7 @@ namespace GFGGame
         }
         }
         private async void OnCtrlChange()
         private async void OnCtrlChange()
         {
         {
+            _myIndex = -1;
             if (_ui.m_c1.selectedIndex == 1)
             if (_ui.m_c1.selectedIndex == 1)
             {
             {
                 if (LeagueDataManager.Instance.GetNumeriValue(LeagueNumericType.LeagueQuestionStatus) == LeagueQuestionStatus.End
                 if (LeagueDataManager.Instance.GetNumeriValue(LeagueNumericType.LeagueQuestionStatus) == LeagueQuestionStatus.End
@@ -94,23 +95,27 @@ namespace GFGGame
         }
         }
         private void UpdateItem(int index, GObject obj, bool isMine)
         private void UpdateItem(int index, GObject obj, bool isMine)
         {
         {
-            LeagueAnswerData answerData = index < 0 ? null : LeagueDataManager.Instance.ListAnswerRankDatas[_ui.m_c1.selectedIndex][index];
+            LeagueAnswerData answerData; //index < 0 ? null : 
             UI_ListRankItem item = UI_ListRankItem.Proxy(obj);
             UI_ListRankItem item = UI_ListRankItem.Proxy(obj);
             if (isMine)
             if (isMine)
             {
             {
+                answerData = index >= 0 ? LeagueDataManager.Instance.ListAnswerRankDatas[_ui.m_c1.selectedIndex][index] : null;
                 RoleInfoManager.Instance.UpdateHeadWithLv(item.m_comHead, RoleDataManager.headId, RoleDataManager.headBorderId, RoleDataManager.lvl);
                 RoleInfoManager.Instance.UpdateHeadWithLv(item.m_comHead, RoleDataManager.headId, RoleDataManager.headBorderId, RoleDataManager.lvl);
                 item.m_txtName.text = RoleDataManager.roleName;
                 item.m_txtName.text = RoleDataManager.roleName;
 
 
             }
             }
             else
             else
             {
             {
+                answerData = LeagueDataManager.Instance.ListAnswerRankDatas[_ui.m_c1.selectedIndex][index];
                 OtherRoleInfoData roleInfoData = LeagueDataManager.Instance.GetMemberRoleInfo(answerData.RoleId);
                 OtherRoleInfoData roleInfoData = LeagueDataManager.Instance.GetMemberRoleInfo(answerData.RoleId);
                 RoleInfoManager.Instance.UpdateHeadWithLv(item.m_comHead, roleInfoData.headId, roleInfoData.headBorderId, roleInfoData.roleLv);
                 RoleInfoManager.Instance.UpdateHeadWithLv(item.m_comHead, roleInfoData.headId, roleInfoData.headBorderId, roleInfoData.roleLv);
                 item.m_txtName.text = answerData == null ? "--" : roleInfoData.roleName;
                 item.m_txtName.text = answerData == null ? "--" : roleInfoData.roleName;
+                if (answerData.RoleId == RoleDataManager.roleId) _myIndex = index;
+
             }
             }
-            int rank = index + 1;
-            item.m_txtRank.text = answerData == null ? "--" : rank.ToString();
-            item.m_c1.selectedIndex = answerData != null && rank <= 3 ? rank : 3;
+            // int rank = index + 1;
+            item.m_txtRank.text = answerData == null ? "--" : (index + 1).ToString();
+            item.m_c1.selectedIndex = answerData != null && index <= 3 ? index : 3;
             item.m_txtContent.SetVar("value", answerData == null ? "0" : answerData.Num.ToString()).FlushVars();
             item.m_txtContent.SetVar("value", answerData == null ? "0" : answerData.Num.ToString()).FlushVars();
             UI_ListRankItem.ProxyEnd();
             UI_ListRankItem.ProxyEnd();
         }
         }

+ 25 - 18
GameClient/Assets/Game/HotUpdate/Views/League/LeagueAnsweringView.cs

@@ -29,7 +29,6 @@ namespace GFGGame
             packageName = UI_LeagueAnsweringUI.PACKAGE_NAME;
             packageName = UI_LeagueAnsweringUI.PACKAGE_NAME;
             _ui = UI_LeagueAnsweringUI.Create();
             _ui = UI_LeagueAnsweringUI.Create();
             this.viewCom = _ui.target;
             this.viewCom = _ui.target;
-            // this.modal = true;
             isfullScreen = true;
             isfullScreen = true;
 
 
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("lm_beijing2");
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("lm_beijing2");
@@ -53,15 +52,12 @@ namespace GFGGame
             EventAgent.AddEventListener(ConstMessage.LEAGUE_ANSWER_RESULT_CHANGE, UpdateResult);
             EventAgent.AddEventListener(ConstMessage.LEAGUE_ANSWER_RESULT_CHANGE, UpdateResult);
             EventAgent.AddEventListener(ConstMessage.LEAGUE_ANSWER_RESULT_CHANGE, UpdateJoinList);
             EventAgent.AddEventListener(ConstMessage.LEAGUE_ANSWER_RESULT_CHANGE, UpdateJoinList);
             EventAgent.AddEventListener(ConstMessage.LEAGUE_ANSWER_MEMBER_CHANGE, UpdateJoinList);
             EventAgent.AddEventListener(ConstMessage.LEAGUE_ANSWER_MEMBER_CHANGE, UpdateJoinList);
-            // EventAgent.AddEventListener(ConstMessage.LEAGUE_NUMBERIC_CHANGE, UpdateQuestionState);
             EventAgent.AddEventListener(ConstMessage.NOTICE_CHAT_MESSAGE, UpdateChatList);
             EventAgent.AddEventListener(ConstMessage.NOTICE_CHAT_MESSAGE, UpdateChatList);
         }
         }
         protected override async void OnShown()
         protected override async void OnShown()
         {
         {
             base.OnShown();
             base.OnShown();
             _dataManager = LeagueDataManager.Instance;
             _dataManager = LeagueDataManager.Instance;
-            // _ui.m_listChat.numItems = ChatDataManager.Instance.GetChatDatas(ChatType.LeagueQuestion).Count;
-            // _ui.m_listChat.scrollPane.ScrollBottom();
             UpdateQuestionState();
             UpdateQuestionState();
             UpdateChatList();
             UpdateChatList();
             bool result = await LeagueSproxy.ReqJoinAnswer();
             bool result = await LeagueSproxy.ReqJoinAnswer();
@@ -89,13 +85,21 @@ namespace GFGGame
 
 
         private void OnBtnBackClick()
         private void OnBtnBackClick()
         {
         {
-            AlertUI.Show("退出活动会损失奖励哦,是否仍要退出?")
-            .SetLeftButton(true, "否")
-            .SetRightButton(true, "是", (object data) =>
+            if (_dataManager.LastAnswerRoleData.LastQuestionResult == LastQuestionResult.Ending)
             {
             {
                 LeagueSproxy.ReqQuitAnswer().Coroutine();
                 LeagueSproxy.ReqQuitAnswer().Coroutine();
                 ViewManager.GoBackFrom(typeof(LeagueAnsweringView).FullName);
                 ViewManager.GoBackFrom(typeof(LeagueAnsweringView).FullName);
-            });
+            }
+            else
+            {
+                AlertUI.Show("退出活动会损失奖励哦,是否仍要退出?")
+                .SetLeftButton(true, "否")
+                .SetRightButton(true, "是", (object data) =>
+                {
+                    LeagueSproxy.ReqQuitAnswer().Coroutine();
+                    ViewManager.GoBackFrom(typeof(LeagueAnsweringView).FullName);
+                });
+            }
         }
         }
         private void OnBtnRuleClick()
         private void OnBtnRuleClick()
         {
         {
@@ -103,6 +107,11 @@ namespace GFGGame
         }
         }
         private async void OnBtnSendClick()
         private async void OnBtnSendClick()
         {
         {
+            if (string.IsNullOrEmpty(_ui.m_txtChat.text))
+            {
+                PromptController.Instance.ShowFloatTextPrompt("还没有输入想发送的内容哦");
+                return;
+            }
             bool result = await ChatSProxy.ReqSendChatMsg(ChatType.LeagueQuestion, _ui.m_txtChat.text);
             bool result = await ChatSProxy.ReqSendChatMsg(ChatType.LeagueQuestion, _ui.m_txtChat.text);
             if (result)
             if (result)
             {
             {
@@ -148,7 +157,6 @@ namespace GFGGame
         }
         }
         private void UpdateQuestion()
         private void UpdateQuestion()
         {
         {
-            // _ui.m_txtRightCount.text = string.Format("全员已答对{0}题", _dataManager.GetNumeriValue(LeagueNumericType.LeagueQuestionTrueCount));
             _ui.m_txtRightCount.SetVar("value", _dataManager.GetNumeriValue(LeagueNumericType.LeagueQuestionTrueCount).ToString()).FlushVars(); ;
             _ui.m_txtRightCount.SetVar("value", _dataManager.GetNumeriValue(LeagueNumericType.LeagueQuestionTrueCount).ToString()).FlushVars(); ;
             _ui.m_txtRightCount1.SetVar("value", _dataManager.GetNumeriValue(LeagueNumericType.LeagueQuestionTrueCount).ToString()).FlushVars(); ;
             _ui.m_txtRightCount1.SetVar("value", _dataManager.GetNumeriValue(LeagueNumericType.LeagueQuestionTrueCount).ToString()).FlushVars(); ;
             _ui.m_ctrlQuestionState.selectedIndex = 0;
             _ui.m_ctrlQuestionState.selectedIndex = 0;
@@ -190,13 +198,13 @@ namespace GFGGame
         }
         }
         private void UpdateResult()
         private void UpdateResult()
         {
         {
+            _ui.m_ctrlResult.selectedIndex = _dataManager.LastAnswerRoleData.LastQuestionResult;
             _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()).FlushVars();
             _ui.m_txtRightCount.SetVar("value", _dataManager.GetNumeriValue(LeagueNumericType.LeagueQuestionTrueCount).ToString()).FlushVars();
             _ui.m_txtRightCount1.SetVar("value", _dataManager.GetNumeriValue(LeagueNumericType.LeagueQuestionTrueCount).ToString()).FlushVars();
             _ui.m_txtRightCount1.SetVar("value", _dataManager.GetNumeriValue(LeagueNumericType.LeagueQuestionTrueCount).ToString()).FlushVars();
             _ui.m_txtCdTime.SetVar("value", GlobalCfgArray.globalCfg.leagueQuestionNextTime.ToString()).FlushVars();
             _ui.m_txtCdTime.SetVar("value", GlobalCfgArray.globalCfg.leagueQuestionNextTime.ToString()).FlushVars();
             _ui.m_ctrlQuestionState.selectedIndex = 1;
             _ui.m_ctrlQuestionState.selectedIndex = 1;
-            _ui.m_ctrlResult.selectedIndex = _dataManager.LastAnswerRoleData.LastQuestionResult;
+
             if (_dataManager.LastAnswerRoleData.LastQuestionResult == LastQuestionResult.SomeBodyRight)
             if (_dataManager.LastAnswerRoleData.LastQuestionResult == LastQuestionResult.SomeBodyRight)
             {
             {
 
 
@@ -240,7 +248,6 @@ namespace GFGGame
                 Timers.inst.Remove(UpdateResultTime);
                 Timers.inst.Remove(UpdateResultTime);
                 return;
                 return;
             }
             }
-            // _ui.m_txtTime.text = (endTime - curTime) / 1000 + "秒后开始下一题";
             _ui.m_txtCdTime.SetVar("value", (((endTime - curTime) / 1000) + 1).ToString()).FlushVars();
             _ui.m_txtCdTime.SetVar("value", (((endTime - curTime) / 1000) + 1).ToString()).FlushVars();
 
 
         }
         }
@@ -264,7 +271,6 @@ namespace GFGGame
             item.target.title = string.Format("{0}.{1}", data, cfg.answerArr[index]);
             item.target.title = string.Format("{0}.{1}", data, cfg.answerArr[index]);
             string myAnswer = _dataManager.LastAnswerRoleData.MyAnswer;
             string myAnswer = _dataManager.LastAnswerRoleData.MyAnswer;
             bool isAnswer = !string.IsNullOrEmpty(_dataManager.LastAnswerRoleData.MyAnswer) && _dataManager.LastAnswerRoleData.LastQuestionId == _dataManager.GetNumeriValue(LeagueNumericType.LeagueQuestionId);
             bool isAnswer = !string.IsNullOrEmpty(_dataManager.LastAnswerRoleData.MyAnswer) && _dataManager.LastAnswerRoleData.LastQuestionId == _dataManager.GetNumeriValue(LeagueNumericType.LeagueQuestionId);
-            // item.m_c1.selectedIndex= !isAnswer;
             item.target.touchable = !isAnswer;
             item.target.touchable = !isAnswer;
             item.m_c1.selectedIndex = isAnswer && myAnswer == data.ToString() && myAnswer != cfg.answerCorrect.ToString() ? 0 : 1;
             item.m_c1.selectedIndex = isAnswer && myAnswer == data.ToString() && myAnswer != cfg.answerCorrect.ToString() ? 0 : 1;
             if (item.target.data == null)
             if (item.target.data == null)
@@ -278,20 +284,21 @@ namespace GFGGame
         {
         {
             GObject obj = context.sender as GObject;
             GObject obj = context.sender as GObject;
             string answer = obj.data.ToString();
             string answer = obj.data.ToString();
-            // ChatSProxy.ReqSendChatMsg(ChatType.LeagueQuestion, answer).Coroutine();
             int questionId = (int)_dataManager.GetNumeriValue(LeagueNumericType.LeagueQuestionId);
             int questionId = (int)_dataManager.GetNumeriValue(LeagueNumericType.LeagueQuestionId);
             LeagueQuestionCfg cfg = LeagueQuestionCfgArray.Instance.GetCfg(questionId);
             LeagueQuestionCfg cfg = LeagueQuestionCfgArray.Instance.GetCfg(questionId);
             bool result = await LeagueSproxy.ReqAnswerQuestion(questionId, answer);
             bool result = await LeagueSproxy.ReqAnswerQuestion(questionId, answer);
-            if (result
-            // && _dataManager.GetNumeriValue(LeagueNumericType.LeagueQuestionId) == _dataManager.LastAnswerRoleData.LastQuestionId
-            // && _dataManager.LastAnswerRoleData.MyAnswer != cfg.answerCorrect
-            )
+            if (result)
             {
             {
                 _ui.m_listResult.numItems = cfg.answerArr.Length;
                 _ui.m_listResult.numItems = cfg.answerArr.Length;
             }
             }
         }
         }
         private async void OnFocuseOut()
         private async void OnFocuseOut()
         {
         {
+            if (string.IsNullOrEmpty(_ui.m_txtResult.text))
+            {
+                PromptController.Instance.ShowFloatTextPrompt("还没有输入答案哦");
+                return;
+            }
             int questionId = (int)_dataManager.GetNumeriValue(LeagueNumericType.LeagueQuestionId);
             int questionId = (int)_dataManager.GetNumeriValue(LeagueNumericType.LeagueQuestionId);
             bool result = await LeagueSproxy.ReqAnswerQuestion(questionId, _ui.m_txtResult.text);
             bool result = await LeagueSproxy.ReqAnswerQuestion(questionId, _ui.m_txtResult.text);
             if (result)
             if (result)

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