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

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

@@ -149,12 +149,6 @@ namespace GFGGame
 
             if (_rechargeCfgs[index].suitId != previousIndex)
             {
-                int rolesScale = 80;
-                if (_rechargeCfgs[index].suitId == 200055 || _rechargeCfgs[index].suitId == 201027)
-                {   
-                    //这里由于这两个套装模型太小，特殊处理放大
-                    rolesScale = 120;
-                }
                 if (item.m_holder.data == null)
                 {
                     DressUpObjUI dressUpObjUI = new DressUpObjUI("SceneSuitFoster");
@@ -162,7 +156,7 @@ namespace GFGGame
                     _dressUpObjUIs.Add(dressUpObjUI);
                 }
                 DressUpObjUI _dressUpObjUI = item.m_holder.data as DressUpObjUI;
-                _dressUpObjUI.ResetSceneObj(rolesScale, false, true, null, false);
+                _dressUpObjUI.ResetSceneObj(100, false, true, null, false);
                     _dressUpObjUI.dressUpObj.PutOnSuitCfg(vipCfg.suitId, true, new int[] { ConstDressUpItemType.BEI_JING }, false, false);
                 _dressUpObjUI.UpdateWrapper(item.m_holder);
             }

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxStarView.cs

@@ -96,7 +96,7 @@ namespace GFGGame
             base.OnInit();
             _ui = UI_LuckyBoxStarUI.Create();
             this.viewCom = _ui.target;
-            //isfullScreen = true;
+            isfullScreen = true;
 
             _ui.m_btnBack.visible = false;
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);