竞技场

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

@@ -49,6 +49,8 @@ namespace GFGGame
         {
             base.OnShown();
             _rankType = ArenaRankType.NOW_SEASON;
+            _ui.m_c1.selectedIndex = 0;
+            _ui.m_c2.selectedIndex = 0;
             _ui.m_listRank.numItems = 100;
             _ui.m_comMyRank.m_btnLook.visible = false;
             ArenaDataManager.Instance.RankDatasDic.Clear();
@@ -197,20 +199,24 @@ namespace GFGGame
                 UpdateTopItem(itemIndex0, arenaData, obj0);
 
                 int itemIndex1 = 1;
+                arenaData = null;
                 if (RankDatasDic.ContainsKey(_rankType) && RankDatasDic[_rankType].Count > itemIndex1)
                 {
                     arenaData = ArenaDataManager.Instance.RankDatasDic[_rankType][itemIndex1];
                 }
                 GObject obj1 = obj.asCom.GetChildAt(itemIndex1);
                 UpdateTopItem(itemIndex1, arenaData, obj1);
+                obj1.visible = _rankType != ArenaRankType.FRIEND || _rankType == ArenaRankType.FRIEND && arenaData != null;
 
                 int itemIndex2 = 2;
+                arenaData = null;
                 if (RankDatasDic.ContainsKey(_rankType) && RankDatasDic[_rankType].Count > itemIndex2)
                 {
                     arenaData = ArenaDataManager.Instance.RankDatasDic[_rankType][itemIndex2];
                 }
                 GObject obj2 = obj.asCom.GetChildAt(itemIndex2);
                 UpdateTopItem(itemIndex2, arenaData, obj2);
+                obj2.visible = _rankType != ArenaRankType.FRIEND || _rankType == ArenaRankType.FRIEND && arenaData != null;
             }
             if (index > 2)
             {

GameClient/Assets/Game/HotUpdate/Views/DressUp/ArenaDressUpFightView.cs

@@ -170,10 +170,22 @@ namespace GFGGame
         }
         private void OnClickBtnBack()
         {
-
-            if (!MyDressUpHelper.CheckPutOnFinish())
+            bool isSave = _itemList.Count == MyDressUpHelper.dressUpObj.itemList.Count;
+            if (isSave)
+            {
+                for (int i = 0; i < _itemList.Count; i++)
+                {
+                    int itemId = MyDressUpHelper.dressUpObj.itemList[i];
+                    if (_itemList.IndexOf(itemId) < 0)
+                    {
+                        isSave = false;
+                        break;
+                    }
+                }
+            }
+            if (!isSave)
             {
-                AlertUI.Show("当前主题尚未穿戴完整,是否确定退出？")
+                AlertUI.Show("当前穿搭尚未保存,是否确定退出？")
                   .SetLeftButton(true, "否").SetRightButton(true, "是", (object data) =>
                 {
                     GoBackToView();
@@ -186,7 +198,7 @@ namespace GFGGame
         }
         private void GoBackToView()
         {
-            _dataManager.DressupList[_dataManager.SelectThemeIndex].itemList = _itemList;
+            _roleData.itemList = _itemList;
             FightDataManager.Instance.SetItemScoreList(_roleData);
             ScoreSystemData.Instance.SetEquipScoresWithPartId(_roleData);
             ViewManager.GoBackFrom(typeof(ArenaDressUpFightView).FullName);
@@ -202,7 +214,7 @@ namespace GFGGame
 
         private void UpdateValueInfo()
         {
-            _dataManager.DressupList[_dataManager.SelectThemeIndex].itemList = MyDressUpHelper.dressUpObj.itemList;
+            _roleData.itemList = MyDressUpHelper.dressUpObj.itemList;
             FightDataManager.Instance.SetItemScoreList(_roleData);
             ScoreSystemData.Instance.SetEquipScoresWithPartId(_roleData);
             ArenaViewManager.Instance.UpdateValue(_ui.m_comValueInfo.target, _dataManager.SelectThemeIndex, _dataManager.DressupList);