飞花令替换UI

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ListTargetItem.cs

@@ -16,6 +16,7 @@ namespace UI.Arena
         public GTextField m_txtRank;
         public GTextField m_txtFightScore;
         public GImage m_imgUpDan;
+        public GLoader m_challengeBtn;
         public const string URL = "ui://4lc5fhlbpsph1m";
         public const string PACKAGE_NAME = "Arena";
         public const string RES_NAME = "ListTargetItem";
@@ -72,6 +73,7 @@ namespace UI.Arena
             m_txtRank = (GTextField)comp.GetChild("txtRank");
             m_txtFightScore = (GTextField)comp.GetChild("txtFightScore");
             m_imgUpDan = (GImage)comp.GetChild("imgUpDan");
+            m_challengeBtn = (GLoader)comp.GetChild("challengeBtn");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -84,6 +86,7 @@ namespace UI.Arena
             m_txtRank = null;
             m_txtFightScore = null;
             m_imgUpDan = null;
+            m_challengeBtn = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -155,14 +155,14 @@ namespace GFGGame
             for (int i = 0; i < ArenaDataManager.Instance.ThemeList.Count; i++)
             {
                 int scoreType = ArenaDataManager.Instance.ThemeList[i];
-                FightData roleData = ArenaDataManager.Instance.DressupList[i];
+                FightData roleData = ArenaDataManager.Instance.DressupList[i].DeepCopy();
                 roleData.scoreType = scoreType;
-                roleData.itemList = ArenaDataManager.Instance.GetRecommentItemList(scoreType, roleData.tags);
+                   roleData.itemList = ArenaDataManager.Instance.GetRecommentItemList(scoreType, roleData.tags);
                 roleData.cardId =
                     ArenaDataManager.Instance.GetRecommentCardId(scoreType, roleData.itemList, wearCardIds);
                 ArenaDataManager.Instance.SetMineFightAttr(roleData, scoreType);
                 ScoreSystemData.Instance.SetEquipScoresWithPartId(roleData);
-                _roleDatas = ArenaDataManager.Instance.DressupList;
+                //_roleDatas = ArenaDataManager.Instance.DressupList;
                 bool result = await ArenaSproxy.ReqChangeArenaDressup(i, roleData.cardId, roleData.itemList);
                 if (!result)
                 {
@@ -174,6 +174,7 @@ namespace GFGGame
             wearCardIds.Clear();
 
             PromptController.Instance.ShowFloatTextPrompt("保存成功");
+
             UpdateView();
         }
 

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

@@ -406,11 +406,11 @@ namespace GFGGame
             item.m_txtFightScore.text = string.Format("飞花令战力:{0}", fightScore);
             item.m_txtRank.text = string.Format("段位排名:{0}", targetData.RankInGrade);
             item.m_imgUpDan.visible = targetData.Grade > ArenaDataManager.Instance.Grade;
-            if (item.m_loaBg.data == null)
+            if (item.m_challengeBtn.data == null)
             {
-                item.m_loaBg.onClick.Add(OnSelectRoleClick);
+                item.m_challengeBtn.onClick.Add(OnSelectRoleClick);
             }
-            item.m_loaBg.data = index;
+            item.m_challengeBtn.data = index;
             if (item.m_btnLook.data == null)
             {
                 item.m_btnLook.onClick.Add(OnBtnLookClick);

GameClient/Assets/Game/HotUpdate/Views/MainStory/StroyFightResultView.cs

@@ -184,7 +184,13 @@ namespace GFGGame
                     if (_dataManager.fieldInfos.bonusWeekly >= _dataManager.fieldInfos.bonusMaxLimit)
                     {
                         AlertUI.Show("本周可获得奖励已达上限，是否继续挑战？")
-                        .SetLeftButton(true)
+                        .SetLeftButton(true, "取消",async (object data) =>
+                        {
+                            if (result)
+                            {
+                                ViewManager.Show<FieldFightEndView>();
+                            }
+                        })
                         .SetRightButton(true, "确认",(object data) =>
                         {
                             if (result)