Merge remote-tracking branch 'remotes/origin/master' into xiaojie

FGUIProject/assets/Arena/ArenaUI.xml

@@ -68,13 +68,13 @@
     <component id="n19_psph" name="btnRefresh" src="psph1j" fileName="components/BtnRefresh.xml" xy="753,1674" group="n49_jcej"/>
     <component id="n18_psph" name="comCostCurrent" src="jcej3y" fileName="components/ComCostCurrency.xml" xy="851,1672" size="156,46" group="n49_jcej"/>
     <group id="n49_jcej" name="n49" xy="753,1672" size="285,46" group="n20_psph"/>
-    <component id="n13_psph" name="btnQuickFight" src="jcejtkk" fileName="components/Button17.xml" pkg="eg2y0ldp" xy="418,1565" group="n20_psph">
+    <component id="n13_psph" name="btnQuickFight" src="jcejtkk" fileName="components/Button17.xml" pkg="eg2y0ldp" xy="418,1528" group="n20_psph">
       <Button title="快速挑战"/>
     </component>
     <component id="n6_psph" name="btnShop" src="psph1g" fileName="components/BtnRecord.xml" xy="78,1659" size="209,61" group="n20_psph" aspect="true">
       <Button title="商店" icon="ui://4lc5fhlbjcej3q"/>
     </component>
-    <component id="n11_psph" name="btnDress" src="oqa1tjt" fileName="components/Button21.xml" pkg="mk0fwx0x" xy="359,1627" group="n20_psph" aspect="true">
+    <component id="n11_psph" name="btnDress" src="oqa1tjt" fileName="components/Button21.xml" pkg="mk0fwx0x" xy="359,1636" group="n20_psph" aspect="true">
       <Button title="我的搭配"/>
     </component>
     <component id="n4_psph" name="btnReward" src="psph1g" fileName="components/BtnRecord.xml" xy="77,1760" size="209,61" group="n20_psph" aspect="true">

FGUIProject/assets/ClothingFoster/ClothingFosterUI.xml

@@ -5,7 +5,7 @@
     <text id="n12_bd1c" name="n12" xy="335,50" size="292,64" fontSize="48" color="#9b7853" text="属性提高比例"/>
     <image id="n13_bd1c" name="n13" src="ehs99" fileName="images/yx_xiant_1.png" pkg="eg2y0ldp" xy="57,120"/>
     <text id="n1_py5g" name="txtDiscribe" xy="80,179" size="254,56" fontSize="42" color="#9b7853" text="完成套装浆洗"/>
-    <list id="n4_py5g" name="listPropertyAdd" xy="45,287" size="871,126" layout="row" colGap="20" defaultItem="ui://uicwtr5bpy5gt" align="center">
+    <list id="n4_py5g" name="listPropertyAdd" xy="17,287" size="927,126" layout="row" colGap="35" defaultItem="ui://uicwtr5bpy5gt" align="center">
       <item/>
       <item/>
       <item/>

FGUIProject/assets/CommonGame/components/BtnBack0.xml

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="90,90" extention="Button">
+<component size="90,95" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <loader id="n4_uyux" name="loaBg" xy="-35,0" size="578,116" touchable="false" url="ui://eg2y0ldpuyuxtj8" autoSize="true"/>
-    <loader id="n3_uyux" name="n3" xy="0,-11" size="111,96" url="ui://eg2y0ldpa0cftl1" autoSize="true"/>
-    <loader id="n5_uyux" name="icon" xy="112,16" pivot="0.5,0.5" size="157,45" align="center" vAlign="middle" fill="scale"/>
-    <text id="n6_idkd" name="title" xy="187,10" pivot="0.5,0.5" size="10,54" font="ui://eg2y0ldpa0cftkv" fontSize="40" color="#ffebc7" strokeColor="#c99954" strokeSize="2" text=""/>
+    <loader id="n4_uyux" name="loaBg" xy="-35,10" size="578,116" touchable="false" url="ui://eg2y0ldpuyuxtj8" autoSize="true"/>
+    <loader id="n3_uyux" name="n3" xy="0,0" size="111,96" url="ui://eg2y0ldpa0cftl1" autoSize="true"/>
+    <loader id="n5_uyux" name="icon" xy="112,27" pivot="0.5,0.5" size="157,45" group="n7_a577" align="center" vAlign="middle" fill="scale"/>
+    <text id="n6_idkd" name="title" xy="187,21" pivot="0.5,0.5" size="10,54" group="n7_a577" font="ui://eg2y0ldpa0cftkv" fontSize="40" color="#ffebc7" strokeColor="#c99954" strokeSize="2" text=""/>
+    <group id="n7_a577" name="n7" xy="112,21" size="157,54"/>
   </displayList>
   <Button/>
 </component>

FGUIProject/assets/Task/components/BattlePassReward.xml

@@ -9,9 +9,9 @@
   <controller name="c2" pages="0,能前往,1,不能前往" selected="0"/>
   <displayList>
     <image id="n6_nd17" name="n6" src="uxxstm7" fileName="imagesNew/txz_lvl_db.png" pkg="eg2y0ldp" xy="9,10"/>
-    <component id="n7_nd17" name="NormalReward" src="mdmdtn5" fileName="components/ComItemBlue.xml" pkg="eg2y0ldp" xy="203,11"/>
+    <component id="n7_nd17" name="NormalReward" src="mdmdtn5" fileName="components/ComItem001_1.xml" pkg="eg2y0ldp" xy="203,11"/>
     <text id="n15_nd17" name="Level" xy="30,42" size="82,62" font="ui://eg2y0ldpa0cftks" fontSize="40" color="#c48624" align="center" autoSize="none" text="1"/>
-    <list id="n18_vixc" name="RewardList" xy="450,10" size="270,123" layout="row" overflow="hidden" scroll="horizontal" colGap="28" defaultItem="ui://eg2y0ldp9jv6tls" align="center" vAlign="middle">
+    <list id="n18_vixc" name="RewardList" xy="450,10" size="270,123" layout="row" overflow="hidden" scroll="horizontal" colGap="28" defaultItem="ui://eg2y0ldp9jv6tls" vAlign="middle">
       <item/>
       <item/>
     </list>

FGUIProject/assets/Task/components/BattlePassRewardItem.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,153">
-  <controller name="c1" pages="0,未完成,1,可领取,2,已领取,3,继续领取" selected="1">
+  <controller name="c1" pages="0,未完成,1,可领取,2,已领取,3,继续领取" selected="3">
     <remark page="0" value="未完成"/>
     <remark page="1" value="可领取"/>
     <remark page="2" value="已领取"/>
@@ -30,7 +30,7 @@
       <gearDisplay controller="c1" pages="2"/>
     </group>
     <text id="n15_nd17" name="Level" xy="30,42" size="82,62" font="ui://eg2y0ldpa0cftks" fontSize="40" color="#c48624" align="center" autoSize="none" text="1"/>
-    <list id="n18_vixc" name="RewardList" xy="450,10" size="270,123" layout="row" overflow="hidden" scroll="horizontal" colGap="28" defaultItem="ui://eg2y0ldp9jv6tls" align="center" vAlign="middle">
+    <list id="n18_vixc" name="RewardList" xy="450,10" size="270,123" layout="row" overflow="hidden" scroll="horizontal" colGap="28" defaultItem="ui://eg2y0ldp9jv6tls" vAlign="middle">
       <item/>
       <item/>
     </list>

FGUIProject/assets/Task/components/ExpProcess.xml

@@ -10,7 +10,7 @@
     <text id="n4_e3m1" name="n4" xy="-56,-27" size="40,31" font="ui://eg2y0ldpa0cftks" fontSize="20" color="#c48624" autoSize="none" text="LV."/>
     <text id="n5_e3m1" name="Level" xy="-80,-18" size="73,62" font="ui://eg2y0ldpa0cftks" fontSize="46" color="#c48624" align="center" autoSize="none" text="000"/>
     <text id="n6_e3m1" name="NumProcess" xy="45,-47" size="76,44" group="n8_cj0b" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#7a4e22" align="center" letterSpacing="-1" vars="true" text="{value=0}/{maxValue=100}"/>
-    <loader id="n7_e3m1" name="icon" xy="2,-40" size="33,31" group="n8_cj0b" url="ui://eg2y0ldpa0cf2h" align="center" vAlign="middle"/>
+    <loader id="n7_e3m1" name="loaIcon" xy="2,-40" size="33,31" group="n8_cj0b" url="ui://eg2y0ldpa0cf2h" align="center" vAlign="middle"/>
     <group id="n8_cj0b" name="n8" xy="2,-47" size="119,44" advanced="true">
       <gearDisplay controller="c1" pages="0"/>
     </group>

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

@@ -34,8 +34,8 @@ namespace GFGGame
         }
 
         private Dictionary<long, FriendInfoData> _friendDic = new Dictionary<long, FriendInfoData>();//好友列表
-        private List<FriendInfoData> _list = new List<FriendInfoData>();
-        public List<FriendInfoData> FriendDatas
+        private List<long> _list = new List<long>();
+        public List<long> FriendDatas
         {
             get
             {
@@ -49,14 +49,17 @@ namespace GFGGame
         }
         public void AddFriend(FriendInfoData roleInfo)
         {
-            if (_friendDic.ContainsKey(roleInfo.roleInfo.roleId)) return;
+            long roleId = roleInfo.roleInfo.roleId;
+            if (_list.IndexOf(roleId) >= 0) return;
+            _list.Add(roleId);
             _friendDic.Add(roleInfo.roleInfo.roleId, roleInfo);
             UpdateFriendList(true);
         }
         public void RemoveFriend(long roleId)
         {
-            if (_friendDic.ContainsKey(roleId))
+            if (_list.IndexOf(roleId) >= 0)
             {
+                _list.Remove(roleId);
                 _friendDic.Remove(roleId);
                 UpdateFriendList(true);
             }
@@ -102,11 +105,11 @@ namespace GFGGame
         }
         public void UpdateFriendList(bool sort)
         {
-            _list = _friendDic.Values.ToList<FriendInfoData>();
+            // _list = _friendDic.Values.ToList<FriendInfoData>();
             if (!sort) return;
-            _list.Sort((FriendInfoData a, FriendInfoData b) =>
+            _list.Sort((long a, long b) =>
             {
-                long count = b.roleInfo.offlineTimeSec - a.roleInfo.offlineTimeSec;
+                long count = _friendDic[b].roleInfo.offlineTimeSec - _friendDic[b].roleInfo.offlineTimeSec;
                 if (count > 0)
                 {
                     return -1;

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

@@ -144,10 +144,11 @@ namespace GFGGame
         {
             if (FriendDataManager.Instance.Count >= FriendDataManager.Instance.maxGetPowerCount) return false;
 
-            List<FriendInfoData> friendInfos = FriendDataManager.Instance.FriendDatas;
+            List<long> friendInfos = FriendDataManager.Instance.FriendDatas;
             for (int i = 0; i < friendInfos.Count; i++)
             {
-                if (friendInfos[i].takeGiftState == ConstBonusStatus.CAN_GET)
+                FriendInfoData friendInfo = FriendDataManager.Instance.GetFriendDataById(friendInfos[i]);
+                if (friendInfo.takeGiftState == ConstBonusStatus.CAN_GET)
                 {
                     return true;
                 }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_ExpProcess.cs

@@ -10,7 +10,7 @@ namespace UI.Task
         public Controller m_c1;
         public GTextField m_Level;
         public GTextField m_NumProcess;
-        public GLoader m_icon;
+        public GLoader m_loaIcon;
         public const string URL = "ui://5mpsibzze3m1tnl";
         public const string PACKAGE_NAME = "Task";
         public const string RES_NAME = "ExpProcess";
@@ -61,14 +61,14 @@ namespace UI.Task
             m_c1 = comp.GetController("c1");
             m_Level = (GTextField)comp.GetChild("Level");
             m_NumProcess = (GTextField)comp.GetChild("NumProcess");
-            m_icon = (GLoader)comp.GetChild("icon");
+            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
             m_Level = null;
             m_NumProcess = null;
-            m_icon = null;
+            m_loaIcon = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaRankView.cs

@@ -300,7 +300,7 @@ namespace GFGGame
                 RoleInfoManager.Instance.UpdateLv(item.m_comLv, arenaData.RoleInfo.roleLv);
                 if (arenaData.Type == FightTargetType.PLAYER)
                 {
-                    long fightScore = _rankType != ArenaRankType.LAST_SEASON && rank > 100 && isSelf ? ArenaDataManager.Instance.GetAllFightScore(ArenaDataManager.Instance.DressupList) : ArenaDataManager.Instance.GetAllFightScore(arenaData.FightPower);
+                    long fightScore = _rankType != ArenaRankType.LAST_SEASON && isSelf ? ArenaDataManager.Instance.GetAllFightScore(ArenaDataManager.Instance.DressupList) : ArenaDataManager.Instance.GetAllFightScore(arenaData.FightPower);
                     //上榜的玩家一定战斗过，可以直接计算
                     item.m_txtFightScore.text = string.Format("飞花令战力：{0}", fightScore);
                     RoleInfoManager.Instance.UpdateHead(item.m_comHead, arenaData.RoleInfo.roleId == RoleDataManager.roleId ? RoleDataManager.headId : arenaData.RoleInfo.headId, arenaData.RoleInfo.roleId == RoleDataManager.roleId ? RoleDataManager.headBorderId : arenaData.RoleInfo.headBorderId);

GameClient/Assets/Game/HotUpdate/Views/Friend/FriendView.cs

@@ -85,7 +85,7 @@ namespace GFGGame
                 {
                     for (int i = 0; i < FriendDataManager.Instance.FriendDatas.Count; i++)
                     {
-                        if (_friendRoleId == FriendDataManager.Instance.FriendDatas[i].roleInfo.roleId)
+                        if (_friendRoleId == FriendDataManager.Instance.FriendDatas[i])
                         {
                             _ui.m_list.selectedIndex = i;
                             _ui.m_list.ScrollToView(i);
@@ -144,7 +144,8 @@ namespace GFGGame
 
         private void RenderListItem(int index, GObject obj)
         {
-            FriendInfoData friendInfo = FriendDataManager.Instance.FriendDatas[index];
+            long roleId = FriendDataManager.Instance.FriendDatas[index];
+            FriendInfoData friendInfo = FriendDataManager.Instance.GetFriendDataById(roleId);
 
             UI_ListItem item = UI_ListItem.Proxy(obj);
 
@@ -157,7 +158,7 @@ namespace GFGGame
             {
                 item.m_btnSend.onClick.Add(OnClickBtnSend);
             }
-            item.m_btnSend.data = friendInfo;
+            item.m_btnSend.data = roleId;
             item.target.data = index;
 
             UI_ListItem.ProxyEnd();
@@ -213,7 +214,7 @@ namespace GFGGame
             AlertUI.Show("是否删除好友？").SetLeftButton(true).SetRightButton(true, "确定", (object data) =>
             {
                 int index = _ui.m_list.selectedIndex;
-                long roleId = FriendDataManager.Instance.FriendDatas[index].roleInfo.roleId;
+                long roleId = FriendDataManager.Instance.FriendDatas[index];
                 FriendSProxy.ReqDeleteFriend(roleId).Coroutine();
             });
         }
@@ -245,9 +246,10 @@ namespace GFGGame
             if (_ui.m_list.numItems > 0)
             {
                 int childIndex = _ui.m_list.ItemIndexToChildIndex(_ui.m_list.selectedIndex);
+                if (childIndex < 0) return;
                 GButton item = _ui.m_list.GetChildAt(childIndex).asButton.GetChild("btnSend").asButton;
-                FriendInfoData friendInfo = item.data as FriendInfoData;
-                selectedIndex = FriendDataManager.Instance.FriendDatas.IndexOf(friendInfo);
+                long roleId = (long)item.data;
+                selectedIndex = FriendDataManager.Instance.FriendDatas.IndexOf(roleId);
             }
             _ui.m_list.numItems = FriendDataManager.Instance.FriendDatas.Count;
             _ui.m_list.selectedIndex = selectedIndex;
@@ -260,7 +262,7 @@ namespace GFGGame
         {
             if (index >= 0)
             {
-                _friendRoleId = FriendDataManager.Instance.FriendDatas[index].roleInfo.roleId;
+                _friendRoleId = FriendDataManager.Instance.FriendDatas[index];
 
                 OtherRoleInfoDetailData roleInfoDetail = await RoleInfoSProxy.ReqOtherRoleDetailInfo(_friendRoleId);
                 if (roleInfoDetail != null)

GameClient/Assets/Game/HotUpdate/Views/Store/ItemExchangeView.cs

@@ -62,8 +62,14 @@ namespace GFGGame
             }
             else
             {
-                long curMoneyCanBuy = ItemDataManager.GetItemNum(_shopCfg.costId) / _shopCfg.price;
-
+                long itemCount = ItemDataManager.GetItemNum(_shopCfg.costId);
+                long curMoneyCanBuy = itemCount / _shopCfg.price;
+                if (_shopCfg.menu1 == ConstStoreTabId.STORE_ARENA)
+                {
+                    itemCount = ItemDataManager.GetItemNum(ConstItemID.ARENA_CUR_COST);
+                    long itemCountOther = ItemDataManager.GetItemNum(ConstItemID.ARENA_PAST_COST);
+                    curMoneyCanBuy = (itemCount + itemCountOther) / _shopCfg.price;
+                }
                 if (_shopCfg.maxBuyNum == 0)
                 {
 

GameClient/Assets/Game/HotUpdate/Views/Task/BattlePassTaskView.cs

@@ -38,7 +38,7 @@ namespace GFGGame
             _ui.m_SpecialReward.m_RewardList.itemRenderer = SpecialRewardRender;
             _ui.m_tip.onClick.Add(RuleController.ShowRuleView);
             _ui.m_tip.data = 300012;
-            _ui.m_LevelProcess.m_NumProcess.icon =
+            _ui.m_LevelProcess.m_loaIcon.url =
                 ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(ConstItemID.BATTLE_PASS_CURRENCY).res);
         }