Merge remote-tracking branch 'remotes/org/master' into xiaojie

GameClient/Assets/Game/HotUpdate/GameConfig.cs

@@ -31,7 +31,7 @@ namespace GFGGame
             ET.Log.Debug($"gamecfg \n{json}");
             var result = JsonMapper.ToObject<Result>(json);
             LoginAddress = result.loginApiUrl;
-            // LoginAddress = "http://login.gfg.com:10005";
+            //LoginAddress = "43.139.184.240:10003";
             //LoginAddress = "175.178.189.228:10013";//测试地址
             showGM = int.Parse(result.showGM);
             if(!string.IsNullOrEmpty(result.openTime))

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/LuckyBox/LuckyBoxWishView.cs

@@ -64,6 +64,8 @@ namespace GFGGame
             {
                 _ui.m_showType.selectedIndex = 0;
             }
+            
+            _ui.m_showType.selectedIndex = 0;
 
             int activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(_actLimitTsy);
             ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(activityId);

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

@@ -1617,6 +1617,78 @@ namespace GFGGame
             RefreshBtnActivityFYJY();
             RefreshBtnXdmhActivity();
         }
+        
+        private void ServerTimeUpdate(object param = null)
+        {
+            long timestamp = (long)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalMilliseconds;
+            if (Math.Abs(TimeHelper.ServerNow() - timestamp) >= 60000)
+            {
+                dateTime = unixStartTime.AddMilliseconds(TimeHelper.ServerNow());
+                _ui.m_serverTime.text = dateTime.ToString();
+                _ui.m_serverTime.visible = true;
+            }
+            else
+            {
+                _ui.m_serverTime.visible = false;
+            }
+        }
+
+        private void HideMainUI()
+        {
+            _ui.m_hide.Play();
+        }
+
+        private void ShowMainUI()
+        {
+            _ui.m_show.Play();
+        }
+
+        private void OnClickBtnGetYuanXiao()
+        {
+            ViewManager.Show<ActivityGetYuanXiaoEntryView>();
+        }
+
+        private void OnClickBtnGetZhongQiu()
+        {
+            ViewManager.Show<TurnTableView>();
+        }
+
+        private void OnClickBtnFYJY()
+        {
+            ViewManager.Show<ActivityHuaRongDaoEntryView>(5016);
+        }
+
+        private void OnClickBtnXDMH()
+        {
+            ViewManager.Show<BlindBoxView>();
+        }
+
+        public static bool IsOutsideWorkingHours()
+        {
+            // 获取当前时间
+            DateTime now = DateTime.Now;
+
+            // 判断今天是否是星期一到星期五（DayOfWeek.Monday 到 DayOfWeek.Friday）
+            if (now.DayOfWeek >= DayOfWeek.Monday && now.DayOfWeek <= DayOfWeek.Friday)
+            {
+                // 判断当前时间是否在 10:00 到 19:00 之间
+                if (now.Hour >= 10 && now.Hour < 19)
+                {
+                    return false; // 在工作时间内返回 false
+                }
+            }
+            else
+            {
+                // 判断当前时间是否在 10:00 到 19:00 之间
+                if (now.Hour >= 10 && now.Hour < 11)
+                {
+                    return false; // 在工作时间内返回 false
+                }
+            }
+
+            // 否则，返回 true
+            return true;
+        }
 
         private void CheckAutoShowViews()
         {
@@ -1624,22 +1696,30 @@ namespace GFGGame
 
             if (GuideDataManager.currentGuideId > 0) return;
             if (GameGlobal.AutoShowCompleted) return;
-            if (!GameGlobal.AfterDataInited) return;
-            if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-            #if !GFGZSB
-            int isRegisterRoleInfo = GameGlobal.myNumericComponent.GetAsInt(NumericType.IsRegisterRoleInfo);
-            if (isRegisterRoleInfo == 0)
+            
+#if !GFGZSB
+            if (LauncherConfig.ChannelId != 101)
             {
-                ViewManager.Show<RoleInfoRegisterView>();
-                return;
+                int isRegisterRoleInfo = GameGlobal.myNumericComponent.GetAsInt(NumericType.IsRegisterRoleInfo);
+                if (isRegisterRoleInfo == 0)
+                {
+                    ViewManager.Show<RoleInfoRegisterView>();
+                    return;
+                }
             }
-            
-            if (LauncherConfig.platformId == 1 && LauncherConfig.ChannelId == (int)ChannelID.DouYou)
+
+            if (IsOutsideWorkingHours())
             {
-                ViewManager.Show<QieHuanView>();
-                return; 
+                if (LauncherConfig.platformId == 1 && LauncherConfig.ChannelId == (int)ChannelID.DouYou)
+                {
+                    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()))
@@ -1811,50 +1891,5 @@ namespace GFGGame
 
             GameGlobal.AutoShowCompleted = true;
         }
-
-        private void ServerTimeUpdate(object param = null)
-        {
-            long timestamp = (long)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalMilliseconds;
-            if (Math.Abs(TimeHelper.ServerNow() - timestamp) >= 60000)
-            {
-                dateTime = unixStartTime.AddMilliseconds(TimeHelper.ServerNow());
-                _ui.m_serverTime.text = dateTime.ToString();
-                _ui.m_serverTime.visible = true;
-            }
-            else
-            {
-                _ui.m_serverTime.visible = false;
-            }
-        }
-
-        private void HideMainUI()
-        {
-            _ui.m_hide.Play();
-        }
-
-        private void ShowMainUI()
-        {
-            _ui.m_show.Play();
-        }
-
-        private void OnClickBtnGetYuanXiao()
-        {
-            ViewManager.Show<ActivityGetYuanXiaoEntryView>();
-        }
-
-        private void OnClickBtnGetZhongQiu()
-        {
-            ViewManager.Show<TurnTableView>();
-        }
-
-        private void OnClickBtnFYJY()
-        {
-            ViewManager.Show<ActivityHuaRongDaoEntryView>(5016);
-        }
-
-        private void OnClickBtnXDMH()
-        {
-            ViewManager.Show<BlindBoxView>();
-        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/RoleInfoRegister/QieHuanView.cs

@@ -44,7 +44,7 @@ namespace GFGGame
 
         private void OnClickBtnDow()
         {
-            Application.OpenURL("http://cdn.goufuguiwxw.com/Apk/万世镜官包.apk");
+            Application.OpenURL("http://cdn.goufuguiwxw.com/Apk/万世镜.apk");
         }
 
         private void OnClickBtnSubmit()

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" });
             }