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

GameClient/Assets/Game/HotUpdate/Views/Common/Controller/LuckyBoxController.cs

@@ -92,18 +92,11 @@ namespace GFGGame
             {
                 //comRes.m_loaRes.url = string.Format("ui://LuckyBox/{0}", _luckyBoxCfg.resArr[_modelIndex]);
                 comRes.m_loaRes.url = ResPathUtil.GetBgImgPath(_luckyBoxCfg.resArr[_modelIndex]);
-                if(_luckyBoxCfg.posArr.Length>0)
-                    comRes.m_loaRes.SetPosition(_luckyBoxCfg.posArr[_modelIndex][0], _luckyBoxCfg.posArr[_modelIndex][1], 1);
-                else
-                    comRes.m_loaRes.SetPosition(115, 80, 1);
-
-                if (_luckyBoxCfg.scaleArr.Length < 0) { 
-                    int direction = _luckyBoxCfg.scaleArr[_modelIndex] >= 0 ? 1 : -1;
-                    float scale = _luckyBoxCfg.scaleArr.Length > 0 ? Math.Abs(_luckyBoxCfg.scaleArr[_modelIndex]) / 10000f : 1;
-                    comRes.m_loaRes.SetScale(direction * scale, scale);
-                }
-                comRes.m_loaRes.SetScale(1.2f, 1.2f);
+                comRes.m_loaRes.SetPosition(_luckyBoxCfg.posArr[_modelIndex][0], _luckyBoxCfg.posArr[_modelIndex][1], 1);
 
+                int direction = _luckyBoxCfg.scaleArr[_modelIndex] >= 0 ? 1 : -1;
+                float scale = _luckyBoxCfg.scaleArr.Length > 0 ? Math.Abs(_luckyBoxCfg.scaleArr[_modelIndex]) / 10000f : 1;
+                comRes.m_loaRes.SetScale(direction * scale, scale);
             }
             else if (_luckyBoxCfg.suitIdArr.Length > 0)
             {