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

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

@@ -313,7 +313,6 @@ namespace GFGGame
             isOpen = true;
             _ui.m_btnHuanZhuang.m_holder1.visible = true;
             _ui.m_btnHuanZhuang.m_holder1.visible = false;
-            this.Hide();
             ViewManager.Show<DressUpView>();
             isOpen = false;
         }
@@ -882,60 +881,64 @@ namespace GFGGame
                 RedDotController.Instance.SetComRedDot(_btnLeague, RedDotDataManager.Instance.GetLeagueRed(), "", -8);
 
             if (redPointUpdateFrame == 9) 
-                RedDotController.Instance.SetComRedDot(_ui.m_btnDailyWelfare.target, RedDotDataManager.Instance.GetDailyWelfareRed(), "", 9, 5);
+                RedDotController.Instance.SetComRedDot(_ui.m_btnDailyWelfare.target, RedDotDataManager.Instance.GetDailyWelfareRed(), "", -10, 5);
 
             if (redPointUpdateFrame == 10)
                 RedDotController.Instance.SetComRedDot(_ui.m_btnActivityLuckyBox.target, RedDotDataManager.Instance.GetMeiRiTeHuiRed()
                 || RedDotDataManager.Instance.GetActLuckyBoxRewardRed(ConstLimitTimeActivityType.ActLimitLuckyBox)
-                || RedDotDataManager.Instance.GetActLuckyBoxTaskdRed() || RedDotDataManager.Instance.GetGiftBagRewardRed(), "", -11, 5);
+                || RedDotDataManager.Instance.GetActLuckyBoxTaskdRed() || RedDotDataManager.Instance.GetGiftBagRewardRed(), "", -21, 2);
 
             if (redPointUpdateFrame == 11)
                 RedDotController.Instance.SetComRedDot(_btnBag, RedDotDataManager.Instance.GetMainBagGiftRed(), "", -8);
 
             if (redPointUpdateFrame == 12)
                 RedDotController.Instance.SetComRedDot(_ui.m_btnActivityDay7.target, RedDotDataManager.Instance.GetActivityDay7Red(), "", 0, 2);
-            RedDotController.Instance.SetComRedDot(_ui.m_btnWanShiLi.target, RedDotDataManager.Instance.GetActivityWanShiLiRed(), "", -25, -7);
+            RedDotController.Instance.SetComRedDot(_ui.m_btnWanShiLi.target, RedDotDataManager.Instance.GetActivityWanShiLiRed(), "", -24, -20);
 
             if (redPointUpdateFrame == 13)
-                RedDotController.Instance.SetComRedDot(_ui.m_btnXiuFang.target, RedDotDataManager.Instance.GetClothingFosterRed() || RedDotDataManager.Instance.GetClothingSyntheticRed(), "", -10, 20);
+                RedDotController.Instance.SetComRedDot(_ui.m_btnXiuFang.target, RedDotDataManager.Instance.GetClothingFosterRed() || RedDotDataManager.Instance.GetClothingSyntheticRed(), "icon_tanhao", -17, 24);
 
             if (redPointUpdateFrame == 14)
-                RedDotController.Instance.SetComRedDot(_ui.m_btnCiPai.target, RedDotDataManager.Instance.GetCardRed(), "", -10, 20);
+            {
+                RedDotController.Instance.SetComRedDot(_ui.m_btnCiPai.target, RedDotDataManager.Instance.GetCardRed(), "icon_tanhao", -44, 33);
+
+            }
 
             if (redPointUpdateFrame == 15)
             {
                 int activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitTsy);
-                Vector2 pos = new Vector2(-10, 20);
+                Vector2 pos = new Vector2(-50, 33);
                 if (activityId > 0)
                 {
                     pos = Vector2.zero;
                 }
                 RedDotController.Instance.SetComRedDot(_ui.m_btnZhaiXing.target,
-                    RedDotDataManager.Instance.GetActLuckyBoxRewardRed(ConstLimitTimeActivityType.ActLimitTsy) || RedDotDataManager.Instance.GetLuckyBoxFreeTimes(), "",
+                    RedDotDataManager.Instance.GetActLuckyBoxRewardRed(ConstLimitTimeActivityType.ActLimitTsy) || RedDotDataManager.Instance.GetLuckyBoxFreeTimes(), "icon_tanhao",
                     (int)pos.x, (int)pos.y);
-
             }
 
             //神都宸游
             if (redPointUpdateFrame == 16)
-                RedDotController.Instance.SetComRedDot(_ui.m_btnOpenServerActivity.target, RedDotDataManager.Instance.GetOpenServerRed(), "", -11, 5);
+                RedDotController.Instance.SetComRedDot(_ui.m_btnOpenServerActivity.target, RedDotDataManager.Instance.GetOpenServerRed(), "", -21, 2);
 
 
             // 阿福赠礼
             if (_ui.m_btnActivityAfuGift.target.visible)
             {
                 if (redPointUpdateFrame == 17)
-                    RedDotController.Instance.SetComRedDot(_ui.m_btnActivityAfuGift.target, ActivityAfuGiftDataManager.Instance.HaveCanGetReward(), "", -43, 2);
+                    RedDotController.Instance.SetComRedDot(_ui.m_btnActivityAfuGift.target, ActivityAfuGiftDataManager.Instance.HaveCanGetReward(), "", -39, -12);
             }
             //海之市
             if (redPointUpdateFrame == 18)
-                RedDotController.Instance.SetComRedDot(_ui.m_btnHaiZhiShi.target, RedDotDataManager.Instance.GetFieldRed(), "", 13, -12);
+            {
+                RedDotController.Instance.SetComRedDot(_ui.m_btnHaiZhiShi.target, RedDotDataManager.Instance.GetFieldRed(), "icon_tanhao", -39, 15);
+            }
 
             // 新春活动
             if (_ui.m_btnTea.target.visible)
             {
                 if (redPointUpdateFrame == 19)
-                    RedDotController.Instance.SetComRedDot(_ui.m_btnTea.target, ActivityTeaDataManager.Instance.GetRewardRed(), "", -8, -1);
+                    RedDotController.Instance.SetComRedDot(_ui.m_btnTea.target, ActivityTeaDataManager.Instance.GetRewardRed(), "", -24, 14);
             }
 
             redPointUpdateFrame++;