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

GameClient/Assets/Game/HotUpdate/GameConfig.cs

@@ -32,7 +32,7 @@ namespace GFGGame
             var result = JsonMapper.ToObject<Result>(json);
             LoginAddress = result.loginApiUrl;
             //LoginAddress = "43.139.184.240:10003";
-            //LoginAddress = "175.178.189.228:10013";//测试地址
+            //LoginAddress = "192.168.1.191:10005";//测试地址
             showGM = int.Parse(result.showGM);
             if(!string.IsNullOrEmpty(result.openTime))
             {

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

@@ -142,9 +142,9 @@ namespace GFGGame
                     item.m_loaIcon.url = ResPathUtil.GetActivityPath("hd_xianshilc", "png");;
                     item.m_loaTitle.visible = false;
                 }
-                else if (openCfg.id == 510)
+                else if (openCfg.id == 511)
                 {
-                    item.m_loaIcon.url = ResPathUtil.GetActivityPath("gg_banner_lc_smcl_ad3", "png");;
+                    item.m_loaIcon.url = ResPathUtil.GetActivityPath("gg_banner_lc_zfy", "png");;
                     item.m_loaTitle.visible = false;
                 }
                 item.m_loaTitle.visible = false;
@@ -178,7 +178,7 @@ namespace GFGGame
             else
             {
                 ActivityOpenCfg OpenCfg = ActivityOpenCfgArray.Instance.GetCfg(openCfg.id);
-                item.m_loaIcon.url = ResPathUtil.GetActivityPath(OpenCfg.res, "png"); ;
+                item.m_loaIcon.url = ResPathUtil.GetActivityPath("gg_banner_lc_zfy", "png"); ;
                 item.m_loaTitle.visible = false;
                 //item.target.visible = false;
                 UI_Button1.ProxyEnd();

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

@@ -888,7 +888,7 @@ namespace GFGGame
 
             List<int> actListChargeIds =
                 ActivityGlobalDataManager.Instance.GetActivityInfoIdsByType(ConstLimitTimeActivityType
-                    .ActLimitChargeId);
+                    .ActLimitOpenServerCharge);
             int actLimitChargeId = actListChargeIds.Count > 0 ? actListChargeIds[0] : 0;
             if (ActivityDataManager.Instance.lastActLimitChargeId != actLimitChargeId)
             {