Merge remote-tracking branch 'remotes/origin/master' into dev

GameClient/Assets/Game/HotUpdate/ServerProxy/ActivitySProxy.cs

@@ -326,7 +326,7 @@ namespace GFGGame
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
-                    ActivityDataManager.Instance.IsGetNewPlayerReward = false;
+                    ActivityDataManager.Instance.IsGetNewPlayerReward = response.Status;
                     BonusController.TryShowBonusList(ItemUtil.CreateItemDataList(response.BonusList));
                     return true;
                 }

GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/NewPlayerTipsView.cs

@@ -68,7 +68,7 @@ namespace GFGGame
         private void OnClickChange()
         {
             GameGlobal.NewPlayerOnceTips = false;
-            _ui.m_t0.Play(() => { this.Hide(); });
+            this.Hide();
         }
 
     }

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

@@ -31,6 +31,7 @@ namespace GFGGame
 
             BtnSkipVertical = _ui.transform.Find("BtnSkipVertical").GetComponent<Button>();
             BtnSkipVertical.onClick.AddListener(OnClickrectBtnSkip);
+            BtnSkipVertical.gameObject.SetActive(false);
 
             videoPlayer = _ui.transform.Find("VideoPlayer").GetComponent<VideoPlayer>();
             videoPlayer.loopPointReached += OnVideoEnded;

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

@@ -704,6 +704,7 @@ namespace GFGGame
 
         private void UpdateLimitedActvityState()
         {
+            _ui.m_btnNewPlayerReward.target.visible = false;
             int actLimitTsyId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitTsy);
             if (actLimitTsyId > 0)
             {
@@ -743,12 +744,12 @@ namespace GFGGame
             _ui.m_btnWanShiLi.target.visible = ActivityWanShiLiDataManager.Instance.CheckOpen();
             _ui.m_btnTea.target.visible = ActivityDataManager.Instance.GetCurOpenActiveByType(12) == 0 ? false : true;
             _ui.m_btnActivityZCJB.target.visible = ActivityDataManager.Instance.GetCurOpenActiveByType(17) == 0 ? false: true;
-            _ui.m_btnNewPlayerReward.target.visible = (ActivityDataManager.Instance.IsGetNewPlayerReward&& GameGlobal.NewPlayerOnceTips&& GameGlobal.AutoNewPlayersTips);
+            _ui.m_btnNewPlayerReward.target.visible = (!ActivityDataManager.Instance.IsGetNewPlayerReward&& GameGlobal.AutoNewPlayersTips);
 
             _ui.m_btnSevenReward.target.visible = !ActivityDataManager.Instance.AllSevenDayBonusGot();
             UpdateSevenIcon();
 
-            if (ActivityDataManager.Instance.IsGetNewPlayerReward)
+            if (!ActivityDataManager.Instance.IsGetNewPlayerReward)
             {
                 RedDotController.Instance.SetComRedDot(_ui.m_btnNewPlayerReward.target, true, "", -8);
             }
@@ -955,7 +956,7 @@ namespace GFGGame
         {
             _ui.m_btnGiftBag1.target.visible = false;
             _ui.m_btnGiftBag2.target.visible = false;
-
+            _ui.m_btnNewPlayerReward.target.visible = false;
             _ui.m_btnHaiZhiShi.m_loaLockIcons.visible = false;
 
             _ui.m_btnXiuFang.m_loaLockIcons.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(XiuFangView).Name, false);
@@ -974,8 +975,8 @@ namespace GFGGame
             //!(!FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(SevenDayLoginView).Name, false) ||
             //ActivityDataManager.Instance.AllSevenDayBonusGot()));
             _ui.m_btnDailyWelfare.target.visible = false;
-            _ui.m_btnNewPlayerReward.target.visible = (ActivityDataManager.Instance.IsGetNewPlayerReward&& GameGlobal.NewPlayerOnceTips&& GameGlobal.AutoNewPlayersTips);
-            if(ActivityDataManager.Instance.IsGetNewPlayerReward)
+            _ui.m_btnNewPlayerReward.target.visible = (!ActivityDataManager.Instance.IsGetNewPlayerReward&& GameGlobal.AutoNewPlayersTips);
+            if(!ActivityDataManager.Instance.IsGetNewPlayerReward)
             {
                 RedDotController.Instance.SetComRedDot(_ui.m_btnNewPlayerReward.target, true, "", -8);
             }
@@ -1137,7 +1138,7 @@ namespace GFGGame
             if (redPointUpdateFrame == 24)
                 {
                     RedDotController.Instance.SetComRedDot(_ui.m_btnMain.target
-                        , MainStoryDataManager.GetChapterRewardStatus(), "");
+                        , MainStoryDataManager.GetChapterRewardStatus(), "",-30,20);
                 }
 
             redPointUpdateFrame++;

GameClient/Assets/ResIn/UUI/UILuckyBox.prefab

@@ -84,7 +84,7 @@ MonoBehaviour:
   m_FallbackScreenDPI: 96
   m_DefaultSpriteDPI: 96
   m_DynamicPixelsPerUnit: 1
-  m_PresetInfoIsWorld: 1
+  m_PresetInfoIsWorld: 0
 --- !u!114 &7362622180705135904
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -200,10 +200,10 @@ RectTransform:
   m_Father: {fileID: 8091540498621025810}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0}
-  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 1440, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &720217753082088938
 CanvasRenderer: