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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/TimeTracing/UI_proBarItem.cs

@@ -9,6 +9,7 @@ namespace UI.TimeTracing
         public GComponent target;
         public Controller m_c1;
         public GImage m_Got;
+        public GLoader m_icon;
         public GImage m_GotIcon;
         public GImage m_canGet;
         public const string URL = "ui://gayfh946iwcl2u";
@@ -60,6 +61,7 @@ namespace UI.TimeTracing
         {
             m_c1 = comp.GetController("c1");
             m_Got = (GImage)comp.GetChild("Got");
+            m_icon = (GLoader)comp.GetChild("icon");
             m_GotIcon = (GImage)comp.GetChild("GotIcon");
             m_canGet = (GImage)comp.GetChild("canGet");
         }
@@ -67,6 +69,7 @@ namespace UI.TimeTracing
         {
             m_c1 = null;
             m_Got = null;
+            m_icon = null;
             m_GotIcon = null;
             m_canGet = null;
             if(disposeTarget && target != null)

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

@@ -244,7 +244,8 @@ namespace GFGGame
                         }
                     }
                     EventAgent.DispatchEvent(ConstMessage.ARENA_FIGHT_RESULT);
-                    PromptController.Instance.ShowFloatTextPrompt("对方排名已发生变化");
+                    //PromptController.Instance.ShowFloatTextPrompt("对方排名已发生变化");
+                    ErrorCodeController.Handler(response.Error);
                     return false;
                 }
                 else

GameClient/Assets/Game/HotUpdate/Views/InstanceZones/InstanceZonesView.cs

@@ -149,7 +149,7 @@ namespace GFGGame
             ViewManager.Show<FieldView>();
         }
 
-        private void OnClickBtnArena()
+        private async void OnClickBtnArena()
         {
             if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(ArenaView).Name))
             {
@@ -160,7 +160,7 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("赛季未开始");
                 return;
             }
-
+            await ArenaSproxy.ReqArenaInfos();
             ViewManager.Show<ArenaView>(this.viewData);
             ViewManager.Show<ArenaLoadingView>();
         }

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxVideoView.cs

@@ -27,6 +27,10 @@ namespace GFGGame
             handle = YooAssets.LoadAssetSync<GameObject>(path);
             _ui = handle.InstantiateSync(UGUIManager.Instance.desktop.transform);
             imgVideo = _ui.transform.Find("ImgVideo").GetComponent<RawImage>();
+            Vector2 imgVideoSizeDelta = imgVideo.rectTransform.sizeDelta;
+            imgVideoSizeDelta.y = Screen.height;
+            imgVideoSizeDelta.x = (VideoWidth / VideoHeight) * imgVideoSizeDelta.y;
+            imgVideo.rectTransform.sizeDelta = imgVideoSizeDelta;
 
 
             BtnSkipVertical = _ui.transform.Find("BtnSkipVertical").GetComponent<Button>();

GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -777,7 +777,7 @@ namespace GFGGame
             {
                 //显示明日可领取
                 int id = DailyLoginCfgArray.Instance.dataArray[ActivityDataManager.Instance.NowSevenDayBonusDay(false)+1].rewardsArr[0][0];
-                if (DailyLoginCfgArray.Instance.dataArray[ActivityDataManager.Instance.NowSevenDayBonusDay(false)]
+                if (DailyLoginCfgArray.Instance.dataArray[ActivityDataManager.Instance.NowSevenDayBonusDay(false)+1]
                         .type == 2)
                 {
                     _ui.m_btnSevenReward.m_Icon.url = ResPathUtil.GetIconPath("tz_kongquednf","png");

GameClient/Assets/Game/HotUpdate/Views/TimeTracing/TimeTracingLevelView.cs

@@ -112,7 +112,7 @@ namespace GFGGame
                             ItemCfg headBorderCfg = ItemCfgArray.Instance.GetCfg(itemInfo[levelCfg.id].HeadBorderItemId);
                             levelItem.m_player.m_headFrame.url = ResPathUtil.GetHeadBorderPath(headBorderCfg.res);
                             levelItem.m_player.m_head.url = ResPathUtil.GetHeadPath(headCfg.res);
-                            RedDotController.Instance.SetComRedDot(levelItem.target, TimeTracingDataManager.Instance.GetLevelRewardStatus(levelCfg.id), "", -30);
+                            RedDotController.Instance.SetComRedDot(levelItem.target, TimeTracingDataManager.Instance.GetLevelRewardStatus(levelCfg.id), "", -30,10);
                         }
                     }
                     else
@@ -129,7 +129,7 @@ namespace GFGGame
                 if (!InstanceZonesDataManager.CheckLevelPass(levelCfg.id))
                 {
                     //设置为解锁关卡
-                    RedDotController.Instance.SetComRedDot(levelItem.target, TimeTracingDataManager.Instance.GetLevelRewardStatus(levelCfg.id),"",-30);
+                    RedDotController.Instance.SetComRedDot(levelItem.target, TimeTracingDataManager.Instance.GetLevelRewardStatus(levelCfg.id),"",-30,10);
                     MainStoryDataManager.currentLevelCfgId = levelCfg.id;
                     levelItem.m_player.target.visible = false;
                 }
@@ -208,6 +208,7 @@ namespace GFGGame
 
                 //}
                 item.m_c1.selectedIndex = TimeTracingDataManager.Instance.GetChapterRewardIDStatus(datas[i].id, datas[i].paramsArr[0]);
+                item.m_icon.url = ResPathUtil.GetIconPath(ItemCfgArray.Instance.GetCfg(datas[i].bonusArr[0][0]).res, "png");
                 if (item.target.data == null)
                 {
                     item.target.onClick.Add(OnBtnGetProBonus);
@@ -223,6 +224,7 @@ namespace GFGGame
             CompositebonusCfg compositeCfg = obj.data as CompositebonusCfg;
             if(num < compositeCfg.count || TimeTracingDataManager.Instance.GetChapterRewardIDStatus(compositeCfg.id, compositeCfg.paramsArr[0]) != 1)
             {
+                GoodsItemTipsController.ShowItemTips(compositeCfg.bonusArr[0][0]);
                 return;
             }
             await TimeTracingSProxy.ReqGetSuitReward(compositeCfg.id);

GameClient/Assets/ResIn/UUI/UILuckyBox.prefab

@@ -200,10 +200,10 @@ RectTransform:
   m_Father: {fileID: 8091540498621025810}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: 762, y: 798}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &720217753082088938
 CanvasRenderer: