Merge branch 'master' of http://10.108.64.190:3000/gfg/client

FGUIProject/assets/League/components/ListChatAnswerItem.xml

@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="670,155">
+  <controller name="c1" pages="0,,1,,2,,3," selected="2"/>
   <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">
       <relation target="" sidePair="height-height,left-left"/>
     </component>
     <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">
+    <loader id="n36_pvb4" name="loaTitle" xy="284,23" size="125,28" group="n37_pvb4" url="ui://tw70qm9d9jv66l" autoSize="true">
+      <gearIcon controller="c1" pages="0,1,2" values="ui://tw70qm9d9jv66k|ui://tw70qm9d9jv66v|ui://tw70qm9d9jv66l" default=""/>
+    </loader>
+    <group id="n37_pvb4" name="n37" xy="113,20" size="296,35" advanced="true" layout="hz" colGap="5" excludeInvisibles="true">
       <relation target="" sidePair="left-left"/>
     </group>
     <image id="n35_pvb4" name="n35" src="9jv66t" fileName="images/lm_dt_dhdk.png" xy="113,62" size="389,84" group="n38_9jv6">

FGUIProject/assets/League/components/ListChatAnswerItemMine.xml

@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="670,116">
+  <controller name="c1" pages="0,,1,,2,,3," selected="3"/>
   <displayList>
     <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"/>
     </component>
-    <loader id="n36_pvb4" name="loaTitle" xy="259,29" size="117,28" group="n37_pvb4" url="ui://tw70qm9d9jv66k" autoSize="true"/>
+    <loader id="n36_pvb4" name="loaTitle" xy="259,29" size="117,28" group="n37_pvb4" autoSize="true">
+      <gearIcon controller="c1" pages="1,2,3" values="ui://tw70qm9d9jv66v|ui://tw70qm9d9jv66l|" default="ui://tw70qm9d9jv66k"/>
+    </loader>
     <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"/>

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

@@ -7,6 +7,7 @@ namespace UI.League
     public partial class UI_ListChatAnswerItem
     {
         public GComponent target;
+        public Controller m_c1;
         public GComponent m_comHead;
         public GTextField m_txtName;
         public GLoader m_loaTitle;
@@ -58,6 +59,7 @@ namespace UI.League
 
         private void Init(GComponent comp)
         {
+            m_c1 = comp.GetController("c1");
             m_comHead = (GComponent)comp.GetChild("comHead");
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_loaTitle = (GLoader)comp.GetChild("loaTitle");
@@ -65,6 +67,7 @@ namespace UI.League
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_c1 = null;
             m_comHead = null;
             m_txtName = null;
             m_loaTitle = null;

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

@@ -7,6 +7,7 @@ namespace UI.League
     public partial class UI_ListChatAnswerItemMine
     {
         public GComponent target;
+        public Controller m_c1;
         public GComponent m_comHead;
         public GLoader m_loaTitle;
         public GTextField m_txtName;
@@ -58,6 +59,7 @@ namespace UI.League
 
         private void Init(GComponent comp)
         {
+            m_c1 = comp.GetController("c1");
             m_comHead = (GComponent)comp.GetChild("comHead");
             m_loaTitle = (GLoader)comp.GetChild("loaTitle");
             m_txtName = (GTextField)comp.GetChild("txtName");
@@ -65,6 +67,7 @@ namespace UI.League
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_c1 = null;
             m_comHead = null;
             m_loaTitle = null;
             m_txtName = null;

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

@@ -274,6 +274,14 @@ namespace GFGGame
         }
         private void UpdateChatList()
         {
+            _memberIds.Sort((long a, long b) =>
+            {
+                int countA = _dataManager.ListAnsweringDatas[a];
+                int countB = _dataManager.ListAnsweringDatas[b];
+                if (countA > countB) return -1;
+                if (countB > countA) return 1;
+                return countB - countA;
+            });
             _ui.m_listChat.numItems = ChatDataManager.Instance.GetChatDatas(ChatType.LeagueQuestion).Count;
             _ui.m_listChat.scrollPane.ScrollBottom(true);
         }
@@ -336,10 +344,12 @@ namespace GFGGame
         {
             ChatData chatData = ChatDataManager.Instance.ChatDatas[ChatType.LeagueQuestion][index];
             OtherRoleInfoData roleInfo = chatData.RoleInfo;
-            UI_ListChatItem item = UI_ListChatItem.Proxy(obj);
+            UI_ListChatAnswerItem item = UI_ListChatAnswerItem.Proxy(obj);
 
             RoleInfoManager.Instance.UpdateHeadWithLv(item.m_comHead, roleInfo.headId, roleInfo.headBorderId, roleInfo.roleLv);
             item.m_txtName.text = roleInfo.roleName;
+            int roldRank = _memberIds.IndexOf(roleInfo.roleId);
+            item.m_c1.selectedIndex = roldRank < 3 ? roldRank : 3;
             string content = "";
             for (int i = 0; i < chatData.Content.Length; i++)
             {
@@ -348,7 +358,7 @@ namespace GFGGame
             }
             item.m_txtChatContent.text = chatData.Content;
 
-            UI_ListChatItem.ProxyEnd();
+            UI_ListChatAnswerItem.ProxyEnd();
         }
         private string GetListChatItemResource(int index)
         {

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

@@ -87,9 +87,9 @@ namespace GFGGame
             _ui.m_t0.Play(() =>
             {
                 _ui.m_comSkill.m_list.numItems = LeagueSkillCountCfgArray.Instance.GetCfg(_type).layerCount;
+                UpdateView(false);
             });
 
-            UpdateView();
         }
 
         protected override void OnHide()
@@ -147,11 +147,15 @@ namespace GFGGame
         }
         private void UpdateView()
         {
+            UpdateView(true);
+        }
+        private void UpdateView(bool showAni)
+        {
             if (LeagueDataManager.Instance.GetSkillProgressByType(_type) < 100 && LeagueDataManager.Instance.GetSkillProgressByType(_type) > 0)
             {
                 if (LeagueDataManager.Instance.CurLayer == _ui.m_comSkill.m_list.numItems)//最后一层
                 {
-                    _ui.m_comSkill.m_list.ScrollToView(LeagueDataManager.Instance.CurLayer - 1, true);
+                    _ui.m_comSkill.m_list.ScrollToView(LeagueDataManager.Instance.CurLayer - 1, showAni);
                 }
                 else
                 {
@@ -167,11 +171,11 @@ namespace GFGGame
                     }
                     if (isActive)
                     {
-                        _ui.m_comSkill.m_list.ScrollToView(LeagueDataManager.Instance.CurLayer, true);
+                        _ui.m_comSkill.m_list.ScrollToView(LeagueDataManager.Instance.CurLayer, showAni);
                     }
                     else
                     {
-                        _ui.m_comSkill.m_list.ScrollToView(LeagueDataManager.Instance.CurLayer - 1, true);
+                        _ui.m_comSkill.m_list.ScrollToView(LeagueDataManager.Instance.CurLayer - 1, showAni);
                     }
                 }
                 // _ui.m_list.ScrollToView(LeagueDataManager.Instance.CurLayer - 1);
@@ -294,7 +298,7 @@ namespace GFGGame
                 _ui.m_holderScore.position = posInScore;
 
                 _ui.m_t1.Play();
-                UpdateView();
+                UpdateView(true);
             }
         }
     }