Merge branch 'master' of http://10.108.64.190:3000/gfg/client

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

@@ -11,6 +11,7 @@ namespace UI.Arena
         public GProgressBar m_progressBar1;
         public GGraph m_holder;
         public GImage m_imgAni;
+        public GTextField m_txtDescLeft;
         public const string URL = "ui://4lc5fhlbrv0954";
         public const string PACKAGE_NAME = "Arena";
         public const string RES_NAME = "ArenaLoadingUI";
@@ -62,6 +63,7 @@ namespace UI.Arena
             m_progressBar1 = (GProgressBar)comp.GetChild("progressBar1");
             m_holder = (GGraph)comp.GetChild("holder");
             m_imgAni = (GImage)comp.GetChild("imgAni");
+            m_txtDescLeft = (GTextField)comp.GetChild("txtDescLeft");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -69,6 +71,7 @@ namespace UI.Arena
             m_progressBar1 = null;
             m_holder = null;
             m_imgAni = null;
+            m_txtDescLeft = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Common/UI_AlertUI.cs

@@ -8,7 +8,6 @@ namespace UI.Common
     {
         public GComponent target;
         public GGraph m_graphBg;
-        public GComponent m_bg;
         public GTextField m_txtContent;
         public GTextField m_txtTips;
         public GButton m_btnLeft;
@@ -61,7 +60,6 @@ namespace UI.Common
         private void Init(GComponent comp)
         {
             m_graphBg = (GGraph)comp.GetChild("graphBg");
-            m_bg = (GComponent)comp.GetChild("bg");
             m_txtContent = (GTextField)comp.GetChild("txtContent");
             m_txtTips = (GTextField)comp.GetChild("txtTips");
             m_btnLeft = (GButton)comp.GetChild("btnLeft");
@@ -70,7 +68,6 @@ namespace UI.Common
         public void Dispose(bool disposeTarget = false)
         {
             m_graphBg = null;
-            m_bg = null;
             m_txtContent = null;
             m_txtTips = null;
             m_btnLeft = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Loading/UI_LoadingView.cs

@@ -11,6 +11,7 @@ namespace UI.Loading
         public GProgressBar m_progressBar1;
         public GGraph m_holder;
         public GImage m_imgAni;
+        public GTextField m_txtDescTop;
         public GTextField m_txtDescLeft;
         public Transition m_t0;
         public const string URL = "ui://dw2lsl19hibu2";
@@ -64,6 +65,7 @@ namespace UI.Loading
             m_progressBar1 = (GProgressBar)comp.GetChild("progressBar1");
             m_holder = (GGraph)comp.GetChild("holder");
             m_imgAni = (GImage)comp.GetChild("imgAni");
+            m_txtDescTop = (GTextField)comp.GetChild("txtDescTop");
             m_txtDescLeft = (GTextField)comp.GetChild("txtDescLeft");
             m_t0 = comp.GetTransition("t0");
         }
@@ -73,6 +75,7 @@ namespace UI.Loading
             m_progressBar1 = null;
             m_holder = null;
             m_imgAni = null;
+            m_txtDescTop = null;
             m_txtDescLeft = null;
             m_t0 = null;
             if(disposeTarget && target != null)

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

@@ -1,6 +1,7 @@
 using FairyGUI;
 using UI.Arena;
 using UnityEngine;
+using System;
 
 namespace GFGGame
 {
@@ -46,6 +47,10 @@ namespace GFGGame
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath(res);
 
             _ui.m_progressBar1.TweenValue(100, 1).OnComplete(Hide);
+
+            TipsDescCfg[] tipsArray = TipsDescCfgArray.Instance.dataArray;
+            System.Random rand = new System.Random();
+            _ui.m_txtDescLeft.text = tipsArray[rand.Next(0, tipsArray.Length)].text;
         }
 
         protected override void OnHide()

GameClient/Assets/Game/HotUpdate/Views/CommonGame/ApproachView.cs

@@ -169,7 +169,7 @@ namespace GFGGame
                     //     isJump = false;
                     //     break;
                     // }
-                    isJump = ViewManager.Show<ClothingShopView>(new object[] { shopId, null, _itemId, needCount }, false, true);
+                    isJump = ViewManager.Show<ClothingShopView>(new object[] { shopId, null, _itemId, needCount }, false);
                     break;
                 case ConstFunctionId.FU_ZHUANG_DECOMPOSE:
                     // this.Hide();

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

@@ -375,7 +375,7 @@ namespace GFGGame
 
         private void OnClickBtnClothingShop()
         {
-            ViewManager.Show<ClothingShopView>(new object[] { null, scoreType }, false, true);
+            ViewManager.Show<ClothingShopView>(new object[] { null, scoreType }, false);
         }
 
         private void OnClickListType1Item(EventContext context)

GameClient/Assets/Game/HotUpdate/Views/Loading/LoadingView.cs

@@ -70,6 +70,9 @@ namespace GFGGame
             int index = Random.Range(0, resNames.Length);
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath(resNames[index]);
 
+            TipsDescCfg[] tipsArray = TipsDescCfgArray.Instance.dataArray;
+            System.Random rand = new System.Random();
+            _ui.m_txtDescTop.text = tipsArray[rand.Next(0, tipsArray.Length)].text;
         }
 
         protected override void OnHide()

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

@@ -349,7 +349,7 @@ namespace GFGGame
             if (isOpen) return;
             isOpen = true;
             _ui.m_btnZhaiXing.m_holder1.visible = false;
-            ViewManager.Show<LuckyBoxView>(null, false, true);
+            ViewManager.Show<LuckyBoxView>(null, false);
             isOpen = false;
         }
 

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

@@ -44,7 +44,7 @@ namespace GFGGame
             base.OnShown();
             selectedID = (viewData == null ? -1 : (int)viewData);
             _ui.m_list.numItems = _badgeList.Count;
-
+            _ui.m_list.scrollPane.ScrollTop();
         }
 
         protected override void OnHide()

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

@@ -36,6 +36,7 @@ namespace GFGGame
             this.viewCom = _ui.target;
             this.viewCom.Center();
             this.modal = true;
+            viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
             _ui.m_btnSure.onClick.Add(OnClickBtnSureAsync);
             _ui.m_btnRandom.onClick.Add(RandomRoleName);

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

@@ -56,6 +56,7 @@ namespace GFGGame
             base.AddEventListener();
             EventAgent.AddEventListener(ConstMessage.NUMERIC_CHANGE, UpdateRedDot);
             EventAgent.AddEventListener(ConstMessage.SHOP_BUY, UpdateRedDot);
+            EventAgent.AddEventListener(ConstMessage.CONTINUOUS_REBATE_GIFT, UpdateRedDot);
             EventAgent.AddEventListener(ConstMessage.NOTICE_BATCH_TASK_STATE_CHANGE, UpdateStoreMonthRedDot);
             EventAgent.AddEventListener(ConstMessage.STORE_BROCADE_WEAV_RECEIVE, UpdateStoreMonthRedDot);
 
@@ -104,6 +105,7 @@ namespace GFGGame
             base.RemoveEventListener();
             EventAgent.RemoveEventListener(ConstMessage.NUMERIC_CHANGE, UpdateRedDot);
             EventAgent.RemoveEventListener(ConstMessage.SHOP_BUY, UpdateRedDot);
+            EventAgent.RemoveEventListener(ConstMessage.CONTINUOUS_REBATE_GIFT, UpdateRedDot);
             EventAgent.RemoveEventListener(ConstMessage.NOTICE_BATCH_TASK_STATE_CHANGE, UpdateStoreMonthRedDot);
             EventAgent.RemoveEventListener(ConstMessage.STORE_BROCADE_WEAV_RECEIVE, UpdateStoreMonthRedDot);
         }
@@ -229,7 +231,13 @@ namespace GFGGame
             RedDotController.Instance.SetComRedDot(_ui.m_comTab.m_btn2.target, (RedDotDataManager.Instance.GetGiftBagRewardRed() || RedDotDataManager.Instance.GetGiftBagRebateRed()));
             if (_ui.m_comTab.m_c1.selectedIndex == ConstStoreTabId.STORE_GIFT_BAG)
             {
-                RedDotController.Instance.SetComRedDot(_ui.m_listSubTab.GetChildAt(ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY).asCom, (RedDotDataManager.Instance.GetGiftBagRewardRed() || RedDotDataManager.Instance.GetGiftBagRebateRed()));
+                RedDotController.Instance.SetComRedDot(_ui.m_listSubTab.GetChildAt(ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY).asCom,RedDotDataManager.Instance.GetGiftBagRewardRed());
+
+                int needSub = 0;
+                if (!ShopDataManager.Instance.GetShopActivityIsShow(ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY))
+                    needSub = 1;
+
+                RedDotController.Instance.SetComRedDot(_ui.m_listSubTab.GetChildAt(ConstStoreSubId.STORE_GIFT_BAG_REBATE - needSub).asCom,RedDotDataManager.Instance.GetGiftBagRebateRed());
             }
         }
 

GameClient/Assets/Game/HotUpdate/Views/ViewManager.cs

@@ -51,6 +51,7 @@ namespace GFGGame
             //await GFGUIPackage.AddPackageAsync(ResPathUtil.GetUIPackagePath("Common"));
             UIConfig.buttonSound = (NAudioClip)UIPackage.GetItemAsset("Common", "click");
 
+            //统一修改文字字体需要填写路径 ResIn/Font/FZKTJW--GB1-0
             UIConfig.defaultFont = "FZKTJW--GB1-0";
             //默认关闭点击窗口移至顶层的功能，不可打开，如哪个界面需要在界面中单独设置
             UIConfig.bringWindowToFrontOnClick = false;
@@ -120,7 +121,7 @@ namespace GFGGame
         /// <param name="viewData">要传递给视图的参数</param>
         /// <param name="goBackParams">从该视图返回的视图信息</param>
         /// <param name="hideOthers">是否关闭其他视图</param>
-        public static bool Show(string fullViewName, object viewData = null, bool hideOthers = false, bool resetGobackParams = false)
+        public static bool Show(string fullViewName, object viewData = null, bool hideOthers = false)
         {
             string name = GetName(fullViewName);
             if (!GameGlobal.skipCheckOpen && !FunctionOpenDataManager.Instance.CheckIsFunOpenById(name))
@@ -204,7 +205,7 @@ namespace GFGGame
             return false;
         }
 
-        public static bool Show<T>(object viewData = null, bool hideOthers = false, bool resetGobackParams = false) where T : class, new()
+        public static bool Show<T>(object viewData = null, bool hideOthers = false) where T : class, new()
         {
             // string[] names = typeof(T).FullName.Split('.');
             // string viewName = names[names.Length - 1];
@@ -434,7 +435,7 @@ namespace GFGGame
                     else
                     {
                         if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(nameof(LeagueView))) return;
-                        ViewManager.Show<LeagueJoinView>(null, hideOther, true);
+                        ViewManager.Show<LeagueJoinView>(null, hideOther);
                     }
 
                     break;
@@ -446,14 +447,14 @@ namespace GFGGame
                     }
                     else
                     {
-                        ViewManager.Show<LeagueJoinView>(null, hideOther, true);
+                        ViewManager.Show<LeagueJoinView>(null, hideOther);
                     }
                     break;
                 case nameof(StoreView):
                     ViewManager.Show<StoreView>(param, hideOther);
                     break;
                 case nameof(StoryChapterListView):
-                    ViewManager.Show($"GFGGame.{jumpId}", param, hideOther, true);
+                    ViewManager.Show($"GFGGame.{jumpId}", param, hideOther);
                     break;
                 case nameof(StoryChapterView):
                     ViewManager.Show<StoryChapterView>(param[0], hideOther);
@@ -471,7 +472,7 @@ namespace GFGGame
                         ViewManager.Show<LuckyBoxView>(null, hideOther);
                     break;
                 default:
-                    ViewManager.Show($"GFGGame.{jumpId}", null, hideOther, true);
+                    ViewManager.Show($"GFGGame.{jumpId}", null, hideOther);
                     break;
             }
             onSuccess?.Invoke();