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

GameClient/Assets/Game/HotUpdate/GameConfig.cs

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

GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/BlindBoxView.cs

@@ -64,6 +64,7 @@ namespace GFGGame
             ItemCfg hidItemCfg = ItemCfgArray.Instance.GetCfg(hidDropOutCfgList[0].item);
             _ui.m_rewardList.numItems = dropOutCfgList.Count;
             _ui.m_hiddenItem.url =  ResPathUtil.GetIconPath(hidItemCfg);
+            _ui.m_buyBtn.m_num.text = blindBoxCfg.CostIDNumArr[1].ToString();
 
             _ui.m_boxList.itemRenderer = RenderBoxList;
             _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_effect, "ui_Activity", "WSJ_UI_DX/WSJ_UI_DX");