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

GameClient/Assets/Game/HotUpdate/Views/CommonGame/GetSuitItemVIew.cs

@@ -126,7 +126,7 @@ namespace GFGGame
             }
             // UpdateItem(itemId);
 
-            _dressUpObjUI.ResetSceneObj(70, false, true, null,  false);
+            _dressUpObjUI.ResetSceneObj(115, false, true, null,  false);
             _dressUpObjUI.dressUpObj.PutOnSuitCfg(suitId, false, null, false, false);
             _dressUpObjUI.UpdateWrapper(_ui.m_holder);
         }

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

@@ -88,8 +88,10 @@ namespace GFGGame
             _day = TimeUtil.GetCurDay();
             _ui.m_txtMonth.text = NumberUtil.GetOldChiniseNumberText(_month);
 
-            DateTime unixStartTime = new DateTime(1970, 1, 1);
-            dateTime = unixStartTime.AddMilliseconds(GameGlobal.OpenServerTime);
+            //这个是0时区的0时间戳，所以转换为中国时间（东八区）需要加八个小时的毫秒
+            DateTime unixStartTime = new DateTime(1970, 1, 1, 0 , 0 , 0);
+            double chinaTime = GameGlobal.OpenServerTime + 28800000;
+            dateTime = unixStartTime.AddMilliseconds(chinaTime);
             UpdateSignView();
             //从主界面自动打开这个界面的话,就显示 1
             if (this.viewData != null)

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

@@ -123,12 +123,18 @@ namespace GFGGame
                 item.m_loaIcon.url = "ui://DailyWelfare/hdbn_xslc_" + openCfg.res;
                 item.m_loaTitle.url = "ui://DailyWelfare/hdbn_wz_xslc_" + openCfg.res;
             }
-            if (openCfg.id == 501)
+            else if (openCfg.id == 501)
             {
                 item.m_loaIcon.url = "ui://DailyWelfare/hdbn_xslc_xslgt";
                 item.m_loaTitle.url = "ui://DailyWelfare/hdbn_wz_xslc_xslgt";
             }
-            if (item.target.data == null)
+            else
+            {
+                item.target.visible = false;
+                UI_Button1.ProxyEnd();
+                return;
+            }
+            if (item.target.data == null && openCfg != null)
             {
                 item.target.onClick.Add(OnBtnLimitChargeAddUpClick);
             }

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

@@ -361,7 +361,7 @@ namespace GFGGame
             if (_curIndex == 1) { 
                 GObject obj = _ui.m_listBg.GetChildAt(_curIndex);
                 UI_ComBox1 comBox = UI_ComBox1.Proxy(obj);
-                RedDotController.Instance.SetComRedDot(comBox.m_btnReward, RedDotDataManager.Instance.GetActLuckyBoxRewardRed(ConstLimitTimeActivityType.ActLimitTsy));
+                RedDotController.Instance.SetComRedDot(comBox.m_btnReward, RedDotDataManager.Instance.GetActLuckyBoxRewardRed(ConstLimitTimeActivityType.ActLimitTsy), "", -21, 18);
 
                 comBox.m_txtCount.SetVar("value", ActivityDataManager.Instance.lastTsyDrawCount.ToString()).FlushVars();
             }

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

@@ -888,7 +888,7 @@ namespace GFGGame
                 RedDotController.Instance.SetComRedDot(_btnLeague, RedDotDataManager.Instance.GetLeagueRed(), "", -8);
 
             if (redPointUpdateFrame == 9) 
-                RedDotController.Instance.SetComRedDot(_ui.m_btnDailyWelfare.target, RedDotDataManager.Instance.GetDailyWelfareRed(), "", 9, -1);
+                RedDotController.Instance.SetComRedDot(_ui.m_btnDailyWelfare.target, RedDotDataManager.Instance.GetDailyWelfareRed(), "", 9, 5);
 
             if (redPointUpdateFrame == 10)
                 RedDotController.Instance.SetComRedDot(_ui.m_btnActivityLuckyBox.target, RedDotDataManager.Instance.GetMeiRiTeHuiRed()
@@ -899,7 +899,7 @@ namespace GFGGame
                 RedDotController.Instance.SetComRedDot(_btnBag, RedDotDataManager.Instance.GetMainBagGiftRed(), "", -8);
 
             if (redPointUpdateFrame == 12)
-                RedDotController.Instance.SetComRedDot(_ui.m_btnActivityDay7.target, RedDotDataManager.Instance.GetActivityDay7Red());
+                RedDotController.Instance.SetComRedDot(_ui.m_btnActivityDay7.target, RedDotDataManager.Instance.GetActivityDay7Red(), "", 0, 2);
             RedDotController.Instance.SetComRedDot(_ui.m_btnWanShiLi.target, RedDotDataManager.Instance.GetActivityWanShiLiRed(), "", -25, -7);
 
             if (redPointUpdateFrame == 13)

GameClient/Assets/Game/HotUpdate/Views/RoleInfo/RoleInfoView.cs

@@ -186,7 +186,7 @@ namespace GFGGame
 
         private void UpdateRedDot()
         {
-            RedDotController.Instance.SetComRedDot(_ui.m_comHead, RedDotDataManager.Instance.GetHeadRed() || RedDotDataManager.Instance.GetHeadBorderRed(), "", -44, 47);
+            RedDotController.Instance.SetComRedDot(_ui.m_comHead, RedDotDataManager.Instance.GetHeadRed() || RedDotDataManager.Instance.GetHeadBorderRed(), "", -30, 40);
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/Store/StoreBrocadeWeavView.cs

@@ -231,7 +231,7 @@ namespace GFGGame
                 itemView.ChangeTxtCountStyle();
                 itemView.GrpGotVisible = BattlePassTaskDataManager.Instance.CheckLevelRewardGet(level);
                 bool redDot = (!BattlePassTaskDataManager.Instance.CheckLevelRewardGet(level) && state == 1);
-                RedDotController.Instance.SetComRedDot(item.m_NormalReward, redDot, "", -27, 32);
+                RedDotController.Instance.SetComRedDot(item.m_NormalReward, redDot, "", -12, 24);
 
             }
             else
@@ -279,7 +279,7 @@ namespace GFGGame
             var isBuy = BattlePassTaskDataManager.Instance.GetIsBuy();
             if (keyValuePair.Item2 && isBuy)
             {
-                RedDotController.Instance.SetComRedDot(itemView.GetGComponentObj, keyValuePair.Item3 == 1);
+                RedDotController.Instance.SetComRedDot(itemView.GetGComponentObj, keyValuePair.Item3 == 1, "", -12, 24);
                 itemView.GrpGotVisible = keyValuePair.Item4;
             }
         }

GameClient/Assets/Game/HotUpdate/Views/Task/TaskView.cs

@@ -104,7 +104,7 @@ namespace GFGGame
             showRedPoint = TaskDataManager.Instance.CheckTaskRewardCanGet(TaskFuncType.Weekly)
                 || DailyTaskDataManager.Instance.GetHadGetRewardNum(TaskFuncType.Weekly);
             RedDotController.Instance.SetComRedDot(_ui.m_btnWeekly, showRedPoint);
-            RedDotController.Instance.SetComRedDot(_ui.m_btnAchieve, TaskDataManager.Instance.CheckTaskRewardCanGet(TaskFuncType.Achievement));
+            RedDotController.Instance.SetComRedDot(_ui.m_btnAchieve, TaskDataManager.Instance.CheckTaskRewardCanGet(TaskFuncType.Achievement), "", -13, 6);
         }
 
     }