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

GameClient/Assets/Game/HotUpdate/Controller/GameController.cs

@@ -272,6 +272,7 @@ namespace GFGGame
             FieldDataManager.Instance.waitToShowFieldFightEndView = false;
             GameGlobal.AutoSevenDayLoginView = true;
             GameGlobal.AutoDailySignView = true;
+            GameGlobal.AutoStoreView = true;
             GameGlobal.PreDataInited = false;
             GameGlobal.AfterDataInited = false;
             QDManager.OnQuitToLoginView();

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

@@ -24,7 +24,18 @@ namespace GFGGame
         public void AddBorderItem(ItemCfg itemCfg)
         {
             Transform tf = sceneObject.transform.Find("Border/BorderRes");
-            string resPath = ResPathUtil.GetPhotographBorderPath(itemCfg.res, ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType));
+            string resPath;
+
+            if (itemCfg.id != ConstItemID.BORDERID)
+            {
+                resPath = ResPathUtil.GetPhotographBorderPath(itemCfg.res, ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType));
+            }
+            // 默认无边框不用加载资源
+            else
+            {
+                resPath = "";
+            }
+
             SetSpriteRendererToTransform(tf, resPath);
             SpriteRenderer spr = tf.GetComponent<SpriteRenderer>();
             spr.sortingOrder = 10000;//边框在所有道具的上边
@@ -135,8 +146,16 @@ namespace GFGGame
                 tf.gameObject.AddComponent<SpriteRenderer>();
                 spr = tf.GetComponent<SpriteRenderer>();
             }
-            SpriteHelper.AddSpriteTo(spr, resPath);
-            spr.size = spr.sprite.bounds.size;//将节点设置为原图大小
+
+            if(resPath != "")
+            {
+                SpriteHelper.AddSpriteTo(spr, resPath);
+                spr.size = spr.sprite.bounds.size;//将节点设置为原图大小
+            }
+            else
+            {
+                spr.sprite = null;
+            }
 
         }
 

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

@@ -359,5 +359,23 @@ namespace GFGGame
             else
                 return true;
         }
+
+        public bool GetShopIdCanBuyInShop(int menuType,List<int> shopListId)
+        {
+            List<ShopCfg> shopCfgs = ShopCfgArray.Instance.GetCfgsBymenu1Andmenu2(ConstStoreTabId.STORE_GIFT_BAG, menuType);
+            if (ShopDataManager.Instance.RemoveNotOpenCfg(shopCfgs).Count == 0)
+                return false;
+
+            foreach (var shopId in shopListId)
+            {
+                int buyNum = ShopDataManager.Instance.GetGoodsBuyNumById(shopId);
+                foreach (var cfg in shopCfgs)
+                {
+                    if (cfg.id == shopId && buyNum < cfg.maxBuyNum)
+                        return true;
+                }
+            }
+            return false;
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/GameGlobal.cs

@@ -36,6 +36,7 @@ namespace GFGGame
         public static int lastLoginTime;//上次登录时间
         public static bool AutoSevenDayLoginView = true;
         public static bool AutoDailySignView = true;
+        public static bool AutoStoreView = true;
 
 
 

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

@@ -1083,6 +1083,15 @@ namespace GFGGame
                     return;
                 }
             }
+            if (GameGlobal.AutoStoreView)
+            {
+                List<int> shopListId = new List<int>() { 40012, 40013 };
+                if (ShopDataManager.Instance.GetShopIdCanBuyInShop(ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY, shopListId))
+                {
+                    ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_GIFT_BAG, ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY });
+                    return;
+                }
+            }
             if (FieldDataManager.Instance.waitToShowFieldFightEndView)
             {
                 ViewManager.Show<FieldFightEndView>();

GameClient/Assets/Game/HotUpdate/Views/Notice/NoticeSystemShowView.cs

@@ -44,6 +44,7 @@ namespace GFGGame
             NoticeInfo noticeInfo = this.viewData as NoticeInfo;
             _ui.m_txtTitle.text = noticeInfo.title;
             _ui.m_ComContent.m_txtContent.text = noticeInfo.content;
+            _ui.m_ComContent.target.scrollPane.ScrollTop();
         }
 
         protected override void OnHide()

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

@@ -63,6 +63,7 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
+            GameGlobal.AutoStoreView = false;
             StoreTabCfg arenaTab = StoreTabCfgArray.Instance.GetCfgByfunctionId(ConstFunctionId.STORE_ARENA);
             _arenaSubTab.Clear();
             _arenaSubTab.Add(new List<string>() { arenaTab.subTabArr[0][0], arenaTab.subTabArr[0][1], arenaTab.subTabArr[0][2] });