Merge branch 'master' of http://192.168.2.10:3000/GFG/Client into yuqian

GameClient/Assets/Game/HotUpdate/Data/ActivityDataManager.cs

@@ -315,10 +315,10 @@ namespace GFGGame
         public Dictionary<int,int> NewYearLoginInfoDic = new Dictionary<int, int>();
         public bool CanGetNewYearLoginRed()
         {
-            foreach (var a in NewYearLoginInfoDic)
-            {
-                if (a.Value == 1) return true;
-            }
+            //foreach (var a in NewYearLoginInfoDic)
+            //{
+            //    if (a.Value == 1) return true;
+            //}
             return false;
         }
 

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

@@ -230,12 +230,22 @@ namespace GFGGame
         private void ShowModel()
         {
             ChangeModelAlphaAnim(_index, 0, 1);
+            Transform obj = _dressUpObjUIs[_index].sceneObject.transform.Find("Role/Body_eff");
+            if(obj != null)
+            {
+                obj.gameObject.SetActive(true);
+            }    
         }
 
         private void HideModel()
         {
             InitModel(_index);
             ChangeModelAlphaAnim(_index, 1, 0);
+            Transform obj = _dressUpObjUIs[_index].sceneObject.transform.Find("Role/Body_eff");
+            if(obj != null)
+            {
+                obj.gameObject.SetActive(false);
+            }
         }
 
         private void ChangeComResLayer()

GameClient/Assets/Game/HotUpdate/Views/OpenServerActivity/OpenServerActivityView.cs

@@ -67,6 +67,7 @@ namespace GFGGame
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("Tx_bg");
             RefreshTimeText();
             UpdateRedDot();
+            _ui.m_buttonNewYearLogin.visible = false;
             //RefreshButtonNewYearLogin();
             Timers.inst.Add(1, 0, UpdateTime);
             Timers.inst.Add(0.2f, 1, ShowEffTime);