雅集

FGUIProject/assets/League/LeagueAnsweringUI.xml

@@ -122,7 +122,7 @@
     </list>
     <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"/>
+    <text id="n35_pvb4" name="txtChat" xy="110,1784" size="653,44" group="n56_miy3" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#b4905d" letterSpacing="-2" vars="true" autoSize="none" text="" input="true" prompt="[color=#A7957E]最多输入50个字[/color]" maxLength="50"/>
     <component id="n36_pvb4" name="btnSend" src="rv091o" fileName="components/Button11.xml" xy="799,1775" size="198,61" group="n56_miy3">
       <Button title="发送"/>
     </component>

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

@@ -34,6 +34,7 @@ namespace GFGGame
             LeagueData = null;
             ListApplyDatas.Clear();
             ListLogDatas.Clear();
+            ListAnsweringDatas.Clear();
             LastAnswerRoleData = null;
         }
         public void SetNumeric(int type, long value)

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

@@ -662,7 +662,6 @@ namespace GFGGame
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
-                    // PromptController.Instance.ShowFloatTextPrompt("购买成功");
                     return true;
                 }
             }

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

@@ -104,9 +104,9 @@ namespace GFGGame
             }
             else
             {
-                OtherRoleInfoData roleInfoData = LeagueDataManager.Instance.LeagueData.LeagueMemberDatas[answerData.RoleId].RoleInfo;
+                OtherRoleInfoData roleInfoData = LeagueDataManager.Instance.GetMemberRoleInfo(answerData.RoleId);
                 RoleInfoManager.Instance.UpdateHeadWithLv(item.m_comHead, roleInfoData.headId, roleInfoData.headBorderId, roleInfoData.roleLv);
-                item.m_txtName.text = answerData == null ? "--" : LeagueDataManager.Instance.GetMemberRoleInfo(answerData.RoleId).roleName;
+                item.m_txtName.text = answerData == null ? "--" : roleInfoData.roleName;
             }
             int rank = index + 1;
             item.m_txtRank.text = answerData == null ? "--" : rank.ToString();

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

@@ -40,7 +40,7 @@ namespace GFGGame
             _ui.m_listResult.itemRenderer = RenderListResultItem;
             _ui.m_listJoin.itemRenderer = RenderListJoinItem;
             _ui.m_listChat.itemRenderer = RenderListChatItem;
-            _ui.m_listChat.itemProvider = GetListItemResource;
+            _ui.m_listChat.itemProvider = GetListChatItemResource;
             _ui.m_listChat.SetVirtual();
             _ui.m_txtResult.onFocusOut.Add(OnFocuseOut);
         }
@@ -58,15 +58,16 @@ namespace GFGGame
         {
             base.OnShown();
             _dataManager = LeagueDataManager.Instance;
-            _ui.m_listChat.numItems = ChatDataManager.Instance.GetChatDatas(ChatType.LeagueQuestion).Count;
-            _ui.m_listChat.scrollPane.ScrollBottom();
+            // _ui.m_listChat.numItems = ChatDataManager.Instance.GetChatDatas(ChatType.LeagueQuestion).Count;
+            // _ui.m_listChat.scrollPane.ScrollBottom();
             UpdateQuestionState();
+            UpdateChatList();
             bool result = await LeagueSproxy.ReqJoinAnswer();
             if (result)
             {
                 UpdateJoinList();
-                UpdateChatList();
             }
+            UpdateChatList();
             Timers.inst.Add(1, 0, UpdateActiveTime);
         }
 
@@ -86,7 +87,13 @@ namespace GFGGame
 
         private void OnBtnBackClick()
         {
-            ViewManager.GoBackFrom(typeof(LeagueAnsweringView).FullName);
+            AlertUI.Show("退出活动会损失奖励哦，是否仍要退出？")
+            .SetLeftButton(true, "否")
+            .SetRightButton(true, "是", (object data) =>
+            {
+                LeagueSproxy.ReqQuitAnswer().Coroutine();
+                ViewManager.GoBackFrom(typeof(LeagueAnsweringView).FullName);
+            });
         }
         private void OnBtnRuleClick()
         {
@@ -173,7 +180,7 @@ namespace GFGGame
                 Timers.inst.Remove(UpdateAnswerTime);
                 return;
             }
-            _ui.m_txtAnswerTime.text = TimeUtil.FormattingTime5((int)(endTime - curTime));
+            _ui.m_txtAnswerTime.text = TimeUtil.FormattingTime7((int)(endTime - curTime));
         }
         private void UpdateResult()
         {
@@ -250,7 +257,8 @@ namespace GFGGame
             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= !isAnswer;
+            item.target.touchable = !isAnswer;
             item.m_c1.selectedIndex = myAnswer == data.ToString() && myAnswer != cfg.answerCorrect.ToString() ? 0 : 1;
             if (item.target.data == null)
             {
@@ -268,8 +276,9 @@ namespace GFGGame
             LeagueQuestionCfg cfg = LeagueQuestionCfgArray.Instance.GetCfg(questionId);
             bool result = await LeagueSproxy.ReqAnswerQuestion(questionId, answer);
             if (result
-            && _dataManager.GetNumeriValue(LeagueNumericType.LeagueQuestionId) == _dataManager.LastAnswerRoleData.LastQuestionId
-            && _dataManager.LastAnswerRoleData.MyAnswer != cfg.answerCorrect)
+            // && _dataManager.GetNumeriValue(LeagueNumericType.LeagueQuestionId) == _dataManager.LastAnswerRoleData.LastQuestionId
+            // && _dataManager.LastAnswerRoleData.MyAnswer != cfg.answerCorrect
+            )
             {
                 _ui.m_listResult.numItems = cfg.answerArr.Length;
             }
@@ -285,7 +294,7 @@ namespace GFGGame
         }
         private void RenderListJoinItem(int index, GObject obj)
         {
-            OtherRoleInfoData roleInfo = _dataManager.LeagueData.LeagueMemberDatas[_memberIds[index]].RoleInfo;
+            OtherRoleInfoData roleInfo = _dataManager.GetMemberRoleInfo(_memberIds[index]);
             UI_ListAnswerJoinItem item = UI_ListAnswerJoinItem.Proxy(obj);
             RoleInfoManager.Instance.UpdateHead(item.m_comHead, roleInfo.headId, roleInfo.headBorderId);
             item.m_txtName.text = roleInfo.roleName;
@@ -295,7 +304,7 @@ namespace GFGGame
         private void RenderListChatItem(int index, GObject obj)
         {
             ChatData chatData = ChatDataManager.Instance.ChatDatas[ChatType.LeagueQuestion][index];
-            OtherRoleInfoData roleInfo = _dataManager.LeagueData.LeagueMemberDatas[_memberIds[index]].RoleInfo;
+            OtherRoleInfoData roleInfo = chatData.RoleInfo;
             UI_ListChatItem item = UI_ListChatItem.Proxy(obj);
 
             RoleInfoManager.Instance.UpdateHeadWithLv(item.m_comHead, roleInfo.headId, roleInfo.headBorderId, roleInfo.roleLv);
@@ -310,9 +319,9 @@ namespace GFGGame
 
             UI_ListChatItem.ProxyEnd();
         }
-        private string GetListItemResource(int index)
+        private string GetListChatItemResource(int index)
         {
-            if (_memberIds[index] == RoleDataManager.roleId)
+            if (ChatDataManager.Instance.GetChatDatas(ChatType.LeagueQuestion)[index].RoleInfo.roleId == RoleDataManager.roleId)
                 return "ui://League/ListChatItemMine";
             else
                 return "ui://League/ListChatItem";