合成补充提交

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

@@ -939,7 +939,7 @@ namespace GFGGame
         /// <returns></returns>
         public bool GetOpenServerRed()
         {
-           if (GetActLuckyBoxRewardRed(ConstLimitTimeActivityType.ActLimitStlyc) || GetGiftBagRewardRed() || GetMeiRiTeHuiRed() || GetOpenServerStoryRed() || ActivityDataManager.Instance.CanGetNewYearLoginRed())
+           if (GetActLuckyBoxRewardRed(ConstLimitTimeActivityType.ActLimitStlyc) || GetGiftBagRewardRed() || GetMeiRiTeHuiRed() || GetOpenServerStoryRed())
                 return true;
 
             return false;

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

@@ -192,7 +192,7 @@ namespace GFGGame
             else if (shopCfg.lockType == LockType.AREND_GRADE)
             {
                 int lockValue = shopCfg.lockValue;
-                if (shopCfg.menu1 == ConstStoreTabId.STORE_ARENA && shopCfg.menu2 != ConstStoreSubId.STORE_ARENA_ITEM)
+                if (shopCfg.menu1 == ConstStoreTabId.STORE_ARENA && shopCfg.menu2 != ConstStoreSubId.STORE_ARENA_ITEM && shopCfg.menu2 < ArenaDataManager.Instance.SeasonId)
                 {
                     bool isDown = ArenaDataManager.Instance.SeasonId - GlobalCfgArray.globalCfg.seasonReduce > 0;
                     lockValue = isDown ? Math.Max(1, shopCfg.lockValue - GlobalCfgArray.globalCfg.rankReduce) : shopCfg.lockValue;
@@ -225,7 +225,7 @@ namespace GFGGame
             else if (shopCfg.lockType == LockType.AREND_GRADE)
             {
                 int lockValue = shopCfg.lockValue;
-                if (shopCfg.menu1 == ConstStoreTabId.STORE_ARENA && shopCfg.menu2 != ConstStoreSubId.STORE_ARENA_ITEM)
+                if (shopCfg.menu1 == ConstStoreTabId.STORE_ARENA && shopCfg.menu2 != ConstStoreSubId.STORE_ARENA_ITEM && shopCfg.menu2 < ArenaDataManager.Instance.SeasonId)
                 {
                     bool isDown = ArenaDataManager.Instance.SeasonId - GlobalCfgArray.globalCfg.seasonReduce > 0;
                     lockValue = isDown ? Math.Max(1, shopCfg.lockValue - GlobalCfgArray.globalCfg.rankReduce) : shopCfg.lockValue;

GameClient/Assets/Game/HotUpdate/Views/MiniGame/MergeGameView.cs

@@ -329,6 +329,8 @@ namespace GFGGame
                 indexX = 0;
                 indexY = 0;
                 //获得奖励
+                idList = MiniGameDateManager.Instance.GetIdListToLL();
+                UpdateTask();
             }
         }
         private async void OnClickAFuBtn()
@@ -365,15 +367,13 @@ namespace GFGGame
                 //if (idList[x][y] == 0)
                 if (x == 4 && y == 0)
                 {
-                    Debug.LogError("位置错误");
-                    return;
+                    y = 1;
                 }
                 else if (x == 4 && y == 4)
                 {
-                    Debug.LogError("位置错误");
-                    return;
+                    y = 3;
                 }
-                
+
                 idList[x][y] = num;
                 itemList[x][y].data = num;
                 itemList[x][y].GetChild("icon").icon = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgByresTypeAndmaterialld(_res, num).resName, "MergeGame");
@@ -422,13 +422,11 @@ namespace GFGGame
                 //if (idList[x][y] == 0)
                 if(x == 4 && y == 0)
                 {
-                    Debug.LogError("位置错误");
-                    return;
+                    y = 1;
                 }
                 else if(x== 4 && y== 4)
                 {
-                    Debug.LogError("位置错误");
-                    return;
+                    y = 3;
                 }
                     
                 idList[x][y] = num;
@@ -516,6 +514,11 @@ namespace GFGGame
         //提交任务
         private async void SubmitTask()
         {
+            if (!InspectionTasks())
+            {
+                PromptController.Instance.ShowFloatTextPrompt("提交材料不足！");
+                return;
+            }
             bool result = await MiniGameProxy.ReqMergeGameLevelPass(taskId);
             if(result)
             {

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

@@ -112,7 +112,7 @@ namespace GFGGame
             RedDotController.Instance.SetComRedDot(_ui.m_btnTenShu, (RedDotDataManager.Instance.GetActLuckyBoxRewardRed(ConstLimitTimeActivityType.ActLimitStlyc) || RedDotDataManager.Instance.GetGiftBagRewardRed() || RedDotDataManager.Instance.GetMeiRiTeHuiRed()), "", -100, 11);
             //RedDotController.Instance.SetComRedDot(_ui.m_btnHeaven, MiniGameDateManager.Instance.GetRewardRot());
             RedDotController.Instance.SetComRedDot(_ui.m_btnAnswerTianmen.target, RedDotDataManager.Instance.GetOpenServerStoryRed(), "", -80, 100);
-            RedDotController.Instance.SetComRedDot(_ui.m_buttonNewYearLogin, ActivityDataManager.Instance.CanGetNewYearLoginRed(), "", 0, 0);
+            //RedDotController.Instance.SetComRedDot(_ui.m_buttonNewYearLogin, ActivityDataManager.Instance.CanGetNewYearLoginRed(), "", 0, 0);
         }
 
         private void UpdateTime(object param)