竞技场

FGUIProject/assets/Arena/ArenaDressInfoUI.xml

@@ -4,7 +4,7 @@
     <remark page="0" value="自己的搭配"/>
     <remark page="1" value="查看他人搭配"/>
   </controller>
-  <controller name="c2" pages="0,,1,,2," selected="0">
+  <controller name="c2" pages="0,,1,,2," selected="1">
     <remark page="0" value="主题一"/>
     <remark page="1" value="主题二"/>
     <remark page="2" value="主题三"/>
@@ -15,17 +15,6 @@
     <loader id="n1_psph" name="loaBg" xy="0,0" size="1080,1920" touchable="false">
       <relation target="" sidePair="width-width,height-height"/>
     </loader>
-    <image id="n81_jcej" name="n81" src="jcej2q" fileName="images/jjsy_xzdik.png" xy="150,80" size="670,75" group="n79_psph"/>
-    <component id="n74_psph" name="btn0" src="psph1e" fileName="components/BtnTab3.xml" xy="151,81" group="n79_psph">
-      <Button checked="true" icon="ui://4lc5fhlbjcej2r" selectedIcon="ui://4lc5fhlbjcej2n" controller="c2" page="0"/>
-    </component>
-    <component id="n77_psph" name="btn1" src="psph1e" fileName="components/BtnTab3.xml" xy="375,81" size="224,77" group="n79_psph">
-      <Button icon="ui://4lc5fhlbjcej2s" selectedIcon="ui://4lc5fhlbjcej2o" controller="c2" page="1"/>
-    </component>
-    <component id="n78_psph" name="btn2" src="psph1e" fileName="components/BtnTab3.xml" xy="599,81" size="224,77" group="n79_psph">
-      <Button icon="ui://4lc5fhlbjcej2t" selectedIcon="ui://4lc5fhlbjcej2p" controller="c2" page="2"/>
-    </component>
-    <group id="n79_psph" name="n79" xy="150,80" size="673,78" advanced="true"/>
     <component id="n83_jcej" name="comValueInfo" src="jcej3t" fileName="components/ComValueInfo.xml" xy="18,236"/>
     <component id="n14_psph" name="comListBg" src="psph16" fileName="components/ComListType.xml" xy="850,40" size="230,1880">
       <relation target="" sidePair="height-height"/>
@@ -44,9 +33,22 @@
       <item/>
       <item/>
     </list>
-    <component id="n80_psph" name="comCard" src="psph1d" fileName="components/ComCard.xml" xy="34,1404">
-      <relation target="" sidePair="center-center,bottom-bottom"/>
+    <component id="n80_psph" name="comCard" src="psph1d" fileName="components/ComCard.xml" xy="34,1292">
+      <relation target="" sidePair="left-left,bottom-bottom"/>
+    </component>
+    <image id="n81_jcej" name="n81" src="jcej2q" fileName="images/jjsy_xzdik.png" xy="128,1611" size="670,75" group="n79_psph"/>
+    <component id="n74_psph" name="btn0" src="psph1e" fileName="components/BtnTab3.xml" xy="129,1612" group="n79_psph">
+      <Button icon="ui://4lc5fhlbjcej2r" selectedIcon="ui://4lc5fhlbjcej2n" controller="c2" page="0"/>
     </component>
+    <component id="n77_psph" name="btn1" src="psph1e" fileName="components/BtnTab3.xml" xy="353,1612" size="224,77" group="n79_psph">
+      <Button checked="true" icon="ui://4lc5fhlbjcej2s" selectedIcon="ui://4lc5fhlbjcej2o" controller="c2" page="1"/>
+    </component>
+    <component id="n78_psph" name="btn2" src="psph1e" fileName="components/BtnTab3.xml" xy="577,1612" size="224,77" group="n79_psph">
+      <Button icon="ui://4lc5fhlbjcej2t" selectedIcon="ui://4lc5fhlbjcej2p" controller="c2" page="2"/>
+    </component>
+    <group id="n79_psph" name="n79" xy="128,1611" size="673,78" advanced="true">
+      <relation target="" sidePair="bottom-bottom"/>
+    </group>
     <component id="n73_psph" name="btnDress" src="r9ritjg" fileName="components/Button17.xml" pkg="mk0fwx0x" xy="107,1725" group="n31_psph">
       <Button title="更换搭配"/>
     </component>

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

@@ -246,13 +246,14 @@ namespace GFGGame
             {
                 ItemCfg cfgA = ItemCfgArray.Instance.GetCfg(a);
                 ItemCfg cfgB = ItemCfgArray.Instance.GetCfg(b);
-                if (ItemDataManager.CheckItemTagsRight(a, tags)) return -1;
-                if (ItemDataManager.CheckItemTagsRight(b, tags)) return 1;
+                bool isTagA = ItemDataManager.CheckItemTagsRight(a, tags);
+                bool isTagB = ItemDataManager.CheckItemTagsRight(b, tags);
+                if (isTagA && !isTagB) return -1;
+                if (isTagB && !isTagA) return 1;
                 int scoreA = ItemDataManager.GetItemAdditionScore(a, scoreType, tags);
                 int scoreB = ItemDataManager.GetItemAdditionScore(b, scoreType, tags);
                 if (scoreA > scoreB) return -1;
                 if (scoreA < scoreB) return 1;
-
                 return cfgA.id - cfgB.id;
             });
             return dressList;

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

@@ -12,13 +12,13 @@ namespace UI.Arena
         public Controller m_c3;
         public GButton m_btnBack;
         public GLoader m_loaBg;
-        public UI_BtnTab3 m_btn0;
-        public UI_BtnTab3 m_btn1;
-        public UI_BtnTab3 m_btn2;
         public UI_ComValueInfo m_comValueInfo;
         public GComponent m_comListBg;
         public GList m_list;
         public UI_ComCard m_comCard;
+        public UI_BtnTab3 m_btn0;
+        public UI_BtnTab3 m_btn1;
+        public UI_BtnTab3 m_btn2;
         public GButton m_btnDress;
         public GButton m_btnRecommend;
         public const string URL = "ui://4lc5fhlbpsph1";
@@ -73,13 +73,13 @@ namespace UI.Arena
             m_c3 = comp.GetController("c3");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_btn0 = (UI_BtnTab3)UI_BtnTab3.Create(comp.GetChild("btn0"));
-            m_btn1 = (UI_BtnTab3)UI_BtnTab3.Create(comp.GetChild("btn1"));
-            m_btn2 = (UI_BtnTab3)UI_BtnTab3.Create(comp.GetChild("btn2"));
             m_comValueInfo = (UI_ComValueInfo)UI_ComValueInfo.Create(comp.GetChild("comValueInfo"));
             m_comListBg = (GComponent)comp.GetChild("comListBg");
             m_list = (GList)comp.GetChild("list");
             m_comCard = (UI_ComCard)UI_ComCard.Create(comp.GetChild("comCard"));
+            m_btn0 = (UI_BtnTab3)UI_BtnTab3.Create(comp.GetChild("btn0"));
+            m_btn1 = (UI_BtnTab3)UI_BtnTab3.Create(comp.GetChild("btn1"));
+            m_btn2 = (UI_BtnTab3)UI_BtnTab3.Create(comp.GetChild("btn2"));
             m_btnDress = (GButton)comp.GetChild("btnDress");
             m_btnRecommend = (GButton)comp.GetChild("btnRecommend");
         }
@@ -90,18 +90,18 @@ namespace UI.Arena
             m_c3 = null;
             m_btnBack = null;
             m_loaBg = null;
-            m_btn0.Dispose();
-            m_btn0 = null;
-            m_btn1.Dispose();
-            m_btn1 = null;
-            m_btn2.Dispose();
-            m_btn2 = null;
             m_comValueInfo.Dispose();
             m_comValueInfo = null;
             m_comListBg = null;
             m_list = null;
             m_comCard.Dispose();
             m_comCard = null;
+            m_btn0.Dispose();
+            m_btn0 = null;
+            m_btn1.Dispose();
+            m_btn1 = null;
+            m_btn2.Dispose();
+            m_btn2 = null;
             m_btnDress = null;
             m_btnRecommend = null;
             if(disposeTarget && target != null)

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

@@ -24,6 +24,10 @@ namespace GFGGame
             {
                 ArenaDataManager.Instance.HistoryDatas.RemoveAt(ArenaDataManager.Instance.HistoryDatas.Count - 1);
             }
+            // if (ViewManager.isViewOpen(typeof(ArenaView).FullName))
+            // {
+            //     ViewManager.Show<ArenaView>();
+            // }
             await ETTask.CompletedTask;
         }
     }
@@ -70,6 +74,10 @@ namespace GFGGame
                             await ArenaSproxy.ReqArenaFightAttr(targetData.RoleInfo.roleId, targetData.FightDatas);
                         }
                     }
+                    if (ViewManager.isViewOpen(typeof(ArenaView).FullName))
+                    {
+                        ViewManager.Show<ArenaView>();
+                    }
                 }
             }
         }
@@ -198,7 +206,7 @@ namespace GFGGame
                         }
                     }
                     EventAgent.DispatchEvent(ConstMessage.ARENA_FIGHT_RESULT);
-
+                    PromptController.Instance.ShowFloatTextPrompt("对方排名已发生变化");
                     return false;
                 }
 
@@ -260,7 +268,7 @@ namespace GFGGame
         }
 
         //获取对手服装属性
-        public static async ETTask ReqArenaFightAttr(long roleId, List<FightData> list)
+        public static async ETTask<bool> ReqArenaFightAttr(long roleId, List<FightData> list)
         {
             S2C_ArenaFightAttr response = null;
             response = (S2C_ArenaFightAttr)await MessageHelper.SendToServer(new C2S_ArenaFightAttr() { TargetRoleId = roleId });
@@ -272,6 +280,7 @@ namespace GFGGame
                     {
                         list[i].cardScore = response.data[i].CardScore;
                         list[i].itemScoreList = response.data[i].SuitScore;
+                        // list[i].itemList = response.data[i].EquipIds;
                         List<PassivitySkillCfg> skillCfgs = PassivitySkillCfgArray.Instance.GetCfgsBycardId(response.data[i].CardId);
 
                         if (response.data[i].SkillId.Count == skillCfgs.Count)
@@ -285,8 +294,10 @@ namespace GFGGame
                         FightDataManager.Instance.SetItemScoreList(list[i]);
                         ScoreSystemData.Instance.SetEquipScoresWithPartId(list[i]);
                     }
+                    return true;
                 }
             }
+            return false;
         }
 
         public static ArenaHistoryData GetArenaHistoryData(ArenaHistoryProto arenaHistoryProto)

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

@@ -16,6 +16,7 @@ namespace GFGGame
         private List<LongPressGesture> _listLongPress = new List<LongPressGesture>();
         private List<FightData> _roleDatas;//可能是自己的搭配，也可能是对方玩家的搭配
         private int _themeIndex = 0;
+        private string _openViewName = "";
         private List<int> _itemList;
         private string[] _tags;
         private int _roleType = 0;//FightRoleType
@@ -68,8 +69,10 @@ namespace GFGGame
             _roleType = (int)(this.viewData as object[])[0];
             _themeIndex = (int)(this.viewData as object[])[1];
             _roleDatas = (this.viewData as object[])[2] as List<FightData>;
+            _openViewName = (this.viewData as object[])[3].ToString();
 
             _ui.m_c1.selectedIndex = _roleType;
+            _ui.m_c2.selectedIndex = _themeIndex;
             if (_sceneObject == null)
             {
                 _sceneObject = GameObject.Instantiate(_scenePrefab);
@@ -95,7 +98,12 @@ namespace GFGGame
         }
         private void OnClickBtnBack()
         {
-            ViewManager.GoBackFrom(typeof(ArenaDressInfoView).FullName);
+            ViewManager.GoBackFrom(typeof(ArenaDressInfoView).FullName);//返回竞技场主界面
+            if (!string.IsNullOrEmpty(_openViewName))
+            {
+                ViewManager.Show(_openViewName);//打开来源界面：如历史记录、排行榜
+            }
+
         }
         private void OnThemeChange()
         {
@@ -108,7 +116,7 @@ namespace GFGGame
         }
         private void OnBtnDressClick()
         {
-            ViewManager.Show<ArenaDressUpFightView>(null, new object[] { typeof(ArenaDressInfoView).FullName, new object[] { _roleType, _themeIndex, _roleDatas } }, true);
+            ViewManager.Show<ArenaDressUpFightView>(null, new object[] { typeof(ArenaDressInfoView).FullName, new object[] { _roleType, _themeIndex, _roleDatas, "" } }, true);
         }
         private async void OnBtnRecommendClick()
         {

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

@@ -67,7 +67,7 @@ namespace GFGGame
             ArenaViewManager.Instance.UpdateDanIcon(item.m_loaDanIcon, historyData.targetData.Grade);
             TimeUtil.FormattingTime(historyData.FightTime, TimeHelper.ServerNow(), out int num, out string str);
             str = str == "秒" ? "刚刚" : num + str + "前";
-            item.m_txtTime.text = string.Format("{0} {1}", str, historyData.IsChallenge ? "发起挑战" : "接收挑战");
+            item.m_txtTime.text = string.Format("{0} {1}", str, historyData.IsChallenge ? "发起挑战" : "接受挑战");
             item.m_btnShow.data = historyData;
             if (item.m_btnLook.data == null)
             {
@@ -89,7 +89,7 @@ namespace GFGGame
             ArenaHistoryData historyData = obj.parent.data as ArenaHistoryData;
             ArenaViewManager.Instance.UpdateFightRoundResult(obj, index, historyData.MyScores, historyData.TargetScores, historyData.targetData, out bool isWin);
         }
-        private void OnBtnLookClick(EventContext context)
+        private async void OnBtnLookClick(EventContext context)
         {
 
             ArenaHistoryData historyData = (context.sender as GObject).data as ArenaHistoryData;
@@ -99,7 +99,11 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("玩家不在线");
                 return;
             }
-            ViewManager.Show<ArenaDressInfoView>(new object[] { FightRoleType.TAEGET, 0, targetData.FightDatas }, new object[] { typeof(ArenaFightRecordView).FullName, null }, true);
+            bool result = await ArenaSproxy.ReqArenaFightAttr(targetData.RoleInfo.roleId, targetData.FightDatas);
+            if (result)
+            {
+                ViewManager.Show<ArenaDressInfoView>(new object[] { FightRoleType.TAEGET, 0, targetData.FightDatas, typeof(ArenaFightRecordView).FullName }, new object[] { typeof(ArenaView).FullName, ViewManager.GetUIView(typeof(ArenaView).Name).viewData }, true);
+            }
 
         }
     }

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

@@ -303,7 +303,7 @@ namespace GFGGame
 
             UI_ListRankItem3.ProxyEnd();
         }
-        private void OnBtnLookClick(EventContext context)
+        private async void OnBtnLookClick(EventContext context)
         {
             ArenaTargetData targetData = (context.sender as GObject).data as ArenaTargetData;
             if (targetData == null || targetData.Type == FightTargetType.ROBOT)
@@ -311,7 +311,11 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("玩家不在线");
                 return;
             }
-            ViewManager.Show<ArenaDressInfoView>(new object[] { FightRoleType.TAEGET, 0, targetData.FightDatas }, new object[] { typeof(ArenaView).FullName, null }, true);
+            bool result = await ArenaSproxy.ReqArenaFightAttr(targetData.RoleInfo.roleId, targetData.FightDatas);
+            if (result)
+            {
+                ViewManager.Show<ArenaDressInfoView>(new object[] { FightRoleType.TAEGET, 0, targetData.FightDatas, typeof(ArenaRankView).FullName }, new object[] { typeof(ArenaView).FullName, ViewManager.GetUIView(typeof(ArenaView).Name).viewData }, true);
+            }
         }
     }
 }

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

@@ -88,6 +88,7 @@ namespace GFGGame
             _valueBarController.OnShown();
             _dataManager.SetMineFightAttr();
 
+            if (_dataManager.DressupList.Count == 0) return;
             InstanceZonesDataManager.FightScene = ConstInstanceZonesType.Arena;
             if (_targetData == null)
             {
@@ -116,7 +117,7 @@ namespace GFGGame
                 _copyDressUpObj.setSceneObj(sceneCopyObject, false, false);
             }
             sceneCopyObject.SetActive(true);
-            for (int i = 0; i < ArenaDataManager.Instance.ThemeList.Count; i++)
+            for (int i = 0; i < _dataManager.ThemeList.Count; i++)
             {
                 Timers.inst.StartCoroutine(ScreenShotTex(i));
             }
@@ -176,7 +177,7 @@ namespace GFGGame
         }
         private void OnBtnAddFightCountClick()
         {
-            if (ArenaDataManager.Instance.IsArenaClearing)
+            if (_dataManager.IsArenaClearing)
             {
                 PromptController.Instance.ShowFloatTextPrompt("结算中......");
                 return;
@@ -201,7 +202,7 @@ namespace GFGGame
         }
         private async void OnBtnRefreshClick()
         {
-            if (ArenaDataManager.Instance.IsArenaClearing)
+            if (_dataManager.IsArenaClearing)
             {
                 PromptController.Instance.ShowFloatTextPrompt("结算中......");
                 return;
@@ -223,12 +224,12 @@ namespace GFGGame
         }
         private void OnBtnDressClick()
         {
-            if (ArenaDataManager.Instance.IsArenaClearing)
+            if (_dataManager.IsArenaClearing)
             {
                 PromptController.Instance.ShowFloatTextPrompt("结算中......");
                 return;
             }
-            ViewManager.Show<ArenaDressInfoView>(new object[] { FightRoleType.MINE, 0, _dataManager.DressupList }, new object[] { typeof(ArenaView).FullName, _targetData }, true);
+            ViewManager.Show<ArenaDressInfoView>(new object[] { FightRoleType.MINE, 0, _dataManager.DressupList, "" }, new object[] { typeof(ArenaView).FullName, this.viewData }, true);
         }
 
         private void OnBtnQuickFightClick()
@@ -245,6 +246,11 @@ namespace GFGGame
 
         private async void OnBtnFightClick()
         {
+            if (_dataManager.IsArenaClearing)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("结算中......");
+                return;
+            }
             if (RoleDataManager.ArenaFightTimes <= 0)
             {
                 PromptController.Instance.ShowFloatTextPrompt("挑战次数不足");
@@ -259,7 +265,8 @@ namespace GFGGame
                 }
             }
 
-            await GetFightResult();
+            bool result = await GetFightResult();
+            if (!result) return;
             if (_ui.m_btnQuickFight.selected)
             {
                 ViewManager.Show<ArenaResultQuickView>();
@@ -269,7 +276,7 @@ namespace GFGGame
                 ViewManager.Show<StoryFightTargetView>(null, null, true);
             }
         }
-        private async ETTask GetFightResult()
+        private async ETTask<bool> GetFightResult()
         {
             _dataManager.myScore.Clear();
             _dataManager.targetScore.Clear();
@@ -277,14 +284,17 @@ namespace GFGGame
             _dataManager.targetFightScore.Clear();
 
             int winCount = 0;
-
+            if (_targetData.Type == FightTargetType.PLAYER)
+            {
+                await ArenaSproxy.ReqArenaFightAttr(_targetData.RoleInfo.roleId, _targetData.FightDatas);
+            }
             for (int i = 0; i < _dataManager.ThemeList.Count; i++)
             {
                 long score = 0;
                 long targetScore = 0;
 
 
-                FightDataManager.Instance.GetQuickFightResult(i, ArenaDataManager.Instance.DressupList[i], _targetData.FightDatas[i], out score, out targetScore);
+                FightDataManager.Instance.GetQuickFightResult(i, _dataManager.DressupList[i], _targetData.FightDatas[i], out score, out targetScore);
 
                 _dataManager.myScore.Add(score);
                 _dataManager.targetScore.Add(targetScore);
@@ -293,7 +303,7 @@ namespace GFGGame
 
             _dataManager.myFightScore = _dataManager.GetFightScoreList(_dataManager.DressupList);
             _dataManager.targetFightScore = _dataManager.GetFightScoreList(_targetData.FightDatas);
-            await ArenaSproxy.ReqArenaFight(winCount >= 2, _targetData, _dataManager.myFightScore, _dataManager.targetFightScore, _dataManager.myScore, _dataManager.targetScore);
+            return await ArenaSproxy.ReqArenaFight(winCount >= 2, _targetData, _dataManager.myFightScore, _dataManager.targetFightScore, _dataManager.myScore, _dataManager.targetScore);
         }
         private void UpdateView()
         {
@@ -415,6 +425,7 @@ namespace GFGGame
         {
             int index = (int)(context.sender as GObject).data;
             _targetData = _dataManager.Targets[index];
+            this.viewData = _targetData;
             _dataManager.SelectTargetIndex = index;
 
             _ui.m_c1.selectedIndex = 1;
@@ -429,7 +440,7 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("玩家不在线");
                 return;
             }
-            ViewManager.Show<ArenaDressInfoView>(new object[] { FightRoleType.TAEGET, 0, targetData.FightDatas }, new object[] { typeof(ArenaView).FullName, _targetData }, true);
+            ViewManager.Show<ArenaDressInfoView>(new object[] { FightRoleType.TAEGET, 0, targetData.FightDatas, "" }, new object[] { typeof(ArenaView).FullName, this.viewData }, true);
         }
 
         private IEnumerator ScreenShotTex(int index)
@@ -440,7 +451,7 @@ namespace GFGGame
 
             GameObject gameObject = _sceneObject.transform.Find("FightCamera").gameObject;
             Camera camera = gameObject.GetComponent<Camera>();
-            ArenaDataManager.Instance.TextureDic[index] = FightDataManager.Instance.GetPrintscreenNTexture(camera);
+            _dataManager.TextureDic[index] = FightDataManager.Instance.GetPrintscreenNTexture(camera);
 
             yield return new WaitForEndOfFrame();
         }

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

@@ -16,9 +16,8 @@ namespace GFGGame
         private UI_ArenaDressUpFightUI _ui;
         // private DressUpObj _dressUpData = new DressUpObj();
         private ArenaDataManager _dataManager;
-        public FightData _roleData;
-        // private int _fightID;
-        // private int _levelID;
+        private FightData _roleData;
+        public List<int> _itemList;
         private float listType1X = 0;
         private float partsListX = 0;
         private DressUpListType currentListType;
@@ -107,6 +106,7 @@ namespace GFGGame
             base.OnShown();
             _dataManager = ArenaDataManager.Instance;
             _roleData = _dataManager.DressupList[_dataManager.SelectThemeIndex];
+            _itemList = new List<int>(_roleData.itemList);
             InstanceZonesDataManager.currentScoreType = _dataManager.ThemeList[_dataManager.SelectThemeIndex];
             InstanceZonesDataManager.currentFightTags = _dataManager.DressupList[_dataManager.SelectThemeIndex].tags;
 
@@ -176,15 +176,21 @@ namespace GFGGame
                 AlertUI.Show("当前主题尚未穿戴完整,是否确定退出？")
                   .SetLeftButton(true, "否").SetRightButton(true, "是", (object data) =>
                 {
-                    ViewManager.GoBackFrom(typeof(ArenaDressUpFightView).FullName);
+                    GoBackToView();
                 });
             }
             else
             {
-                ViewManager.GoBackFrom(typeof(ArenaDressUpFightView).FullName);
+                GoBackToView();
             }
         }
-
+        private void GoBackToView()
+        {
+            _dataManager.DressupList[_dataManager.SelectThemeIndex].itemList = _itemList;
+            FightDataManager.Instance.SetItemScoreList(_roleData);
+            ScoreSystemData.Instance.SetEquipScoresWithPartId(_roleData);
+            ViewManager.GoBackFrom(typeof(ArenaDressUpFightView).FullName);
+        }
         private void OnClickBtnHome()
         {
             AlertUI.Show("是否返回？")
@@ -196,6 +202,7 @@ namespace GFGGame
 
         private void UpdateValueInfo()
         {
+            _dataManager.DressupList[_dataManager.SelectThemeIndex].itemList = MyDressUpHelper.dressUpObj.itemList;
             FightDataManager.Instance.SetItemScoreList(_roleData);
             ScoreSystemData.Instance.SetEquipScoresWithPartId(_roleData);
             ArenaViewManager.Instance.UpdateValue(_ui.m_comValueInfo.target, _dataManager.SelectThemeIndex, _dataManager.DressupList);
@@ -369,6 +376,7 @@ namespace GFGGame
                 bool result = await ArenaSproxy.ReqChangeArenaDressup(_dataManager.SelectThemeIndex, 0, MyDressUpHelper.dressUpObj.itemList);
                 if (result)
                 {
+                    _itemList = new List<int>(MyDressUpHelper.dressUpObj.itemList);
                     PromptController.Instance.ShowFloatTextPrompt("保存成功");
                 }
             }

GameClient/Assets/Game/HotUpdate/Views/RoleInfo/GMPanelView.cs

@@ -131,7 +131,13 @@ namespace GFGGame
         private async void OnClickBtnArenaGrade()
         {
             string gm = string.Format("SetArenaRank|{0}|{1}", _ui.m_ComBtn.m_txtArenaGrade.text, _ui.m_ComBtn.m_txtArenaRank.text);
-            await GMController.SendGMCommand(gm, "Ð޸ijɹ¦");
+            bool result = await GMController.SendGMCommand(gm, "Ð޸ijɹ¦");
+            if (result)
+            {
+                ArenaDataManager.Instance.Grade = int.Parse(_ui.m_ComBtn.m_txtArenaGrade.text);
+                ArenaDataManager.Instance.Rank = int.Parse(_ui.m_ComBtn.m_txtArenaRank.text);
+                ArenaDataManager.Instance.TryUpdateHighest();
+            }
         }
 
         private async void OnClickBtnAll()

GameClient/Assets/Game/Launcher/LauncherConfig.cs

@@ -78,8 +78,8 @@ namespace GFGGame
         public static void InitPlatform(string json)
         {
             var result = JsonMapper.ToObject<Result>(json);
-            LauncherConfig.CDN_ROOT = result.cdnRoot;
-            //CDN_ROOT = "http://10.108.64.127/";
+            // LauncherConfig.CDN_ROOT = result.cdnRoot;
+            CDN_ROOT = "http://10.108.64.105/";
             LauncherConfig.logApiRootUrl = result.logApiUrl;
             //LauncherConfig.logApiRootUrl = "http://10.108.64.106:8080/api/Log/";
             LauncherConfig.logApiReportLauncherUrl = LauncherConfig.logApiRootUrl + "ReportNode";

GameClient/Assets/Resources/PlayerSettings.asset

@@ -13,9 +13,9 @@ MonoBehaviour:
   m_Name: PlayerSettings
   m_EditorClassIdentifier: 
   assets:
-  - privacypolicy_e619923224a05b27c6edbab55b2afbf7
-  - privacypolicychildren_4b4c084ab06cd5a3370e845b1479a003
-  - serviceprotocal_c45e9bb36af2e000bbfa833337c6c345
+  - privacypolicy_ed19a0cca9d07246eb1d85aa4bd69bbe
+  - privacypolicychildren_679f2f31989b3002daf503519fd771c5
+  - serviceprotocal_4a2a3eefdbec744df05fd8a503579d37
   - Manifest.version
   - Manifest
   offlineMode: 0

GameClient/Assets/StreamingAssets/Bundles/Manifest

@@ -1 +1 @@
-{"version":1,"appVersion":"1.6","bundles":[{"id":0,"name":"privacypolicy","assets":["Assets/ResIn/Txt/privacyPolicy.txt"],"size":15559,"crc":766635756,"nameWithAppendHash":"privacypolicy_ed19a0cca9d07246eb1d85aa4bd69bbe","dependencies":[]},{"id":1,"name":"privacypolicychildren","assets":["Assets/ResIn/Txt/privacyPolicyChildren.txt"],"size":6444,"crc":2835290838,"nameWithAppendHash":"privacypolicychildren_679f2f31989b3002daf503519fd771c5","dependencies":[]},{"id":2,"name":"serviceprotocal","assets":["Assets/ResIn/Txt/serviceProtocal.txt"],"size":15467,"crc":1335140532,"nameWithAppendHash":"serviceprotocal_4a2a3eefdbec744df05fd8a503579d37","dependencies":[]}]}
+{"version":4,"appVersion":"1.6","bundles":[{"id":0,"name":"privacypolicy","assets":["Assets/ResIn/Txt/privacyPolicy.txt"],"size":15559,"crc":766635756,"nameWithAppendHash":"privacypolicy_ed19a0cca9d07246eb1d85aa4bd69bbe","dependencies":[]},{"id":1,"name":"privacypolicychildren","assets":["Assets/ResIn/Txt/privacyPolicyChildren.txt"],"size":6444,"crc":2835290838,"nameWithAppendHash":"privacypolicychildren_679f2f31989b3002daf503519fd771c5","dependencies":[]},{"id":2,"name":"serviceprotocal","assets":["Assets/ResIn/Txt/serviceProtocal.txt"],"size":15467,"crc":1335140532,"nameWithAppendHash":"serviceprotocal_4a2a3eefdbec744df05fd8a503579d37","dependencies":[]}]}

GameClient/Assets/StreamingAssets/Bundles/Manifest.version

@@ -1 +1 @@
-{"crc":2591188714,"size":666,"version":1,"appVersion":"1.6"}
+{"crc":301456539,"size":666,"version":4,"appVersion":"1.6"}

GameClient/ProjectSettings/ProjectSettings.asset

@@ -13,7 +13,7 @@ PlayerSettings:
   useOnDemandResources: 0
   accelerometerFrequency: 60
   companyName: gfg
-  productName: "\u4E07\u4E16\u955C_local"
+  productName: "\u4E07\u4E16\u955C_zy"
   defaultCursor: {fileID: 0}
   cursorHotspot: {x: 0, y: 0}
   m_SplashScreenBackgroundColor: {r: 0, g: 0, b: 0, a: 1}
@@ -164,7 +164,7 @@ PlayerSettings:
   androidSupportedAspectRatio: 1
   androidMaxAspectRatio: 2.1
   applicationIdentifier:
-    Android: com.shenyou.gfg.local
+    Android: com.shenyou.gfg.zy
     Standalone: com.DefaultCompany.GFGClient
   buildNumber:
     Standalone: 0