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

GameClient/Assets/Game/HotUpdate/Platform/AliPay/AliManager.cs

@@ -9,7 +9,9 @@ namespace GFGGame
     {
         public void Init()
         {
-            AliPayManagerInit.Instance.aliSDKListener = new AliPaySDKListener();
+#if GFGZSB
+                         AliPayManagerInit.Instance.aliSDKListener = new AliPaySDKListener();     
+#endif
         }
         
         //支付宝支付
@@ -28,6 +30,7 @@ namespace GFGGame
         }
     }
 
+#if GFGZSB
     /// <summary>
     /// SDK回调
     /// </summary>
@@ -51,4 +54,5 @@ namespace GFGGame
             Debug.Log("Game.HotUpdate VxPayReceiveAb: " + message);
         }
     }
+#endif
 }

GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/DailyWelfareView.cs

@@ -137,6 +137,11 @@ namespace GFGGame
                         item.m_loaTitle.visible = false;
                     }
                 }
+                else if (openCfg.id == 502)
+                {
+                    item.m_loaIcon.url = ResPathUtil.GetActivityPath("hd_xianshilc", "png");;
+                    item.m_loaTitle.visible = false;
+                }
                 item.m_loaTitle.visible = false;
             }
             else if (openCfg.id == 501)

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

@@ -1624,9 +1624,8 @@ namespace GFGGame
 
             if (GuideDataManager.currentGuideId > 0) return;
             if (GameGlobal.AutoShowCompleted) return;
-            if (!GameGlobal.AfterDataInited) return;
-            if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-            #if !GFGZSB
+            
+#if !GFGZSB
             int isRegisterRoleInfo = GameGlobal.myNumericComponent.GetAsInt(NumericType.IsRegisterRoleInfo);
             if (isRegisterRoleInfo == 0)
             {
@@ -1639,7 +1638,10 @@ namespace GFGGame
                 ViewManager.Show<QieHuanView>();
                 return; 
             }
-            #endif
+#endif
+            
+            if (!GameGlobal.AfterDataInited) return;
+            if (!ViewManager.CheckIsTopView(this.viewCom)) return;
             
             if (RoleDataManager.lvl < 5) return;
             //if (!TimeUtil.CheckIsSameTime(lastTime * 1000, TimeHelper.ClientNow()))

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

@@ -69,6 +69,12 @@ namespace GFGGame
             _arenaSubTab.Add(new List<string>() { arenaTab.subTabArr[0][0], arenaTab.subTabArr[0][1], arenaTab.subTabArr[0][2] });
             for (int i = ArenaDataManager.Instance.SeasonId; i > 0; i--)
             {
+                List<ShopCfg> shopCfgs = ShopCfgArray.Instance.GetCfgsBymenu1Andmenu2(ConstStoreTabId.STORE_ARENA, i);
+                if (shopCfgs.Count == 0)
+                {
+                    continue;
+                }
+
                 _arenaSubTab.Add(new List<string>() { string.Format("第{0}赛季", i), i.ToString(), "StoreArenaView" });
             }