新春活动提交，小游戏补充提交

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_ActivityTeaVisitUI.cs

@@ -12,6 +12,7 @@ namespace UI.ActivityAfternoonTea
         public GTextField m_time;
         public GLoader m_ruleIcon;
         public GList m_taskList;
+        public GImage m_visitNumTips;
         public GTextField m_visitNum;
         public const string URL = "ui://wpsqkdbznjone";
         public const string PACKAGE_NAME = "ActivityAfternoonTea";
@@ -65,6 +66,7 @@ namespace UI.ActivityAfternoonTea
             m_time = (GTextField)comp.GetChild("time");
             m_ruleIcon = (GLoader)comp.GetChild("ruleIcon");
             m_taskList = (GList)comp.GetChild("taskList");
+            m_visitNumTips = (GImage)comp.GetChild("visitNumTips");
             m_visitNum = (GTextField)comp.GetChild("visitNum");
         }
         public void Dispose(bool disposeTarget = false)
@@ -74,6 +76,7 @@ namespace UI.ActivityAfternoonTea
             m_time = null;
             m_ruleIcon = null;
             m_taskList = null;
+            m_visitNumTips = null;
             m_visitNum = null;
             if(disposeTarget && target != null)
             {

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

@@ -39,11 +39,33 @@ namespace GFGGame
         {
             var response = (S2C_GetStarMiniGameRewrd)await MessageHelper.SendToServer(new C2S_GetStarMiniGameRewrd { GameId = gameID, GameType = gameType, ActivityId = activityId,Star = star });
             if (!(response is { Error: ErrorCode.ERR_Success })) return false;
-            MiniGameDateManager.Instance.gameinfoList[gameType-1] = response.GameInfo;
+            for (int i =0;i< MiniGameDateManager.Instance.gameinfoList.Count;i++)
+            {
+                if (MiniGameDateManager.Instance.gameinfoList[i].GameType == 1)
+                {
+                    MiniGameDateManager.Instance.gameinfoList[i] = response.GameInfo;
+                }
+            }
             //奖励弹窗
             BonusController.TryShowBonusList(ItemUtil.CreateItemDataList(response.BonusList));
             return true;
         }
+        public static async ETTask<bool> ReqGetFirstPassReward(int gameID, int gameType, int activityId)
+        {
+            var response = (S2C_GetFirstPassReward)await MessageHelper.SendToServer(new C2S_GetFirstPassReward { GameId = gameID, GameType = gameType, ActivityId = activityId });
+            if (!(response is { Error: ErrorCode.ERR_Success })) return false;
+            for (int i = 0; i < MiniGameDateManager.Instance.gameinfoList.Count; i++)
+            {
+                if (MiniGameDateManager.Instance.gameinfoList[i].GameType == 2)
+                {
+                    MiniGameDateManager.Instance.gameinfoList[i] = response.GameInfo;
+                }
+            }
+            //奖励弹窗
+            BonusController.TryShowBonusList(ItemUtil.CreateItemDataList(response.BonusList));
+            return true;
+        }
+
 
         public static async ETTask<bool> ReqGetGameUnlock(int id,int type,int activityId)
         {

GameClient/Assets/Game/HotUpdate/Views/ActivityAfternoonTea/ActivityTeaVisitView.cs

@@ -33,6 +33,7 @@ namespace GFGGame
 
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
             _ui.m_ruleIcon.onClick.Add(RuleController.ShowRuleView);
+            _ui.m_visitNumTips.onClick.Add(RuleController.ShowRuleView);
             _ui.m_taskList.itemRenderer = RenderTaskList;
 
         }
@@ -42,6 +43,7 @@ namespace GFGGame
             base.OnShown();
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("xnbh_bg");
             _ui.m_ruleIcon.data = 300026;
+            _ui.m_visitNumTips.data = 300026;
             _ui.m_taskList.numItems = ActivityVisitCfgArray.Instance.dataArray.Length;
         }
 

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

@@ -16,9 +16,9 @@ namespace GFGGame
         private MiniGame[] gameNameDate;
         //由于每个游戏都有一个表
         private List<CardGame> CardGameDate;
-        private List<GameInfoProto> CardGameInfo;
+        private List<GameInfoProto> CardGameInfo = new List<GameInfoProto>();
         private List<Merge2048Game> Merge2048GameDate;
-        private List<GameInfoProto> Merge2048GameInfo;
+        private List<GameInfoProto> Merge2048GameInfo = new List<GameInfoProto>();
 
         private int oneNumItems;
         private int twoNumItems;
@@ -82,8 +82,9 @@ namespace GFGGame
             }
 
             _ui.m_reward.m_rewardOneList.numItems = CardGameInfo[0].StarRewardStatus.Count == 0? CardGameInfo.Count : CardGameInfo[0].StarRewardStatus.Count;
+            oneNumItems = CardGameInfo[0].StarRewardStatus.Count == 0 ? CardGameInfo.Count : CardGameInfo[0].StarRewardStatus.Count;
             _ui.m_reward.m_rewardTwoList.numItems = Merge2048GameInfo[0].StarRewardStatus.Count == 0 ? Merge2048GameInfo.Count : Merge2048GameInfo[0].StarRewardStatus.Count;
-
+            twoNumItems = Merge2048GameInfo[0].StarRewardStatus.Count == 0 ? Merge2048GameInfo.Count : Merge2048GameInfo[0].StarRewardStatus.Count;
         }
         protected override void OnHide()
         {
@@ -119,13 +120,13 @@ namespace GFGGame
         {
             UI_ChallengeRewardItemUI item = UI_ChallengeRewardItemUI.Proxy(obj);
             int starNum = 3 - index;
-            item.m_rewardDesc.text = string.Format("{0}游戏关卡{1}首次通关", MiniGameArray.Instance.GetCfg(gameList[2]).typeName,index);
+            item.m_rewardDesc.text = string.Format("{0}游戏关卡{1}首次通关", MiniGameArray.Instance.GetCfg(gameList[2]).typeName,index+1);
             item.m_rewardList.itemRenderer = RenditemReward;
             //读表
             //var reward;
-            item.m_getBtn.m_c1.selectedIndex = Merge2048GameInfo[index].IsCleared? 1:0;
+            item.m_getBtn.m_c1.selectedIndex = Merge2048GameInfo[index].FirstPassRewardStatus;
             item.m_rewardList.data = gameList[2];
-            item.m_rewardList.numItems = Merge2048GameDate[0].bonusStar3Arr.Length;
+            item.m_rewardList.numItems = Merge2048GameDate[index].bonusWinFirstArr.Length;
 
             if (item.m_getBtn.target.data == null)
             {
@@ -137,7 +138,7 @@ namespace GFGGame
             rewardList.Add(Merge2048GameDate[0].type);
             rewardList.Add(1);
             rewardList.Add(3 - index);
-            rewardList.Add(Merge2048GameInfo[index].IsCleared ? 1 : 0);
+            rewardList.Add(Merge2048GameInfo[index].FirstPassRewardStatus);
             item.m_getBtn.target.data = rewardList;
             UI_ChallengeRewardItemUI.ProxyEnd();
         }
@@ -193,12 +194,20 @@ namespace GFGGame
 
             if (!(context.sender is GObject btnGet)) return;
             List<int> itemList = btnGet.data as List<int>;
-            if(itemList[4] != 1)
+            if (itemList[4] != 1)
             {
                 return;
             }
-            var result = await MiniGameProxy.ReqGetReward(itemList[0], itemList[1], itemList[2], itemList[3]);
-            if (!result) return;
+            if (itemList[1] == 1)
+            { 
+                var result = await MiniGameProxy.ReqGetReward(itemList[0], itemList[1], itemList[2], itemList[3]);
+                if (!result) return;
+            }
+            else if(itemList[1] == 2)
+            {
+                var result = await MiniGameProxy.ReqGetFirstPassReward(itemList[0], itemList[1], itemList[2]);
+                if (!result) return;
+            }
             _ui.m_reward.m_rewardOneList.numItems = oneNumItems;
             _ui.m_reward.m_rewardTwoList.numItems = twoNumItems;
         }

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

@@ -92,21 +92,27 @@ namespace GFGGame
             var result = await MiniGameProxy.ReqGetChallengeReward(1);
             if (!result) return;
             int j = 0;
-            foreach (GameInfoProto t in MiniGameDateManager.Instance.gameinfoList)
+            for (int i = 1; i < MiniGameDateManager.Instance.gameinfoList.Count; i++)
             {
+                GameInfoProto t = MiniGameDateManager.Instance.gameinfoList[i];
                 if (t.GameType == type)
                 {
+                    _ui.m_gameLock1.visible = false;
+                    _ui.m_newGame1.visible = MiniGameDateManager.Instance.gameinfoList[i].PlayCount == 0 ? true : false;
+
                     j++;
                     switch (j)
                     {
                         case 1:
-                            _ui.m_gameLock1.visible = !t.IsUnlock;
+
                             break;
                         case 2:
-                            _ui.m_gameLock2.visible = !t.IsUnlock;
+                            _ui.m_gameLock2.visible = !MiniGameDateManager.Instance.gameinfoList[i-1].IsCleared;
+                            _ui.m_newGame2.visible = t.PlayCount == 0 ? true : false;
                             break;
                         case 3:
-                            _ui.m_gameLock3.visible = !t.IsUnlock;
+                            _ui.m_gameLock3.visible = !MiniGameDateManager.Instance.gameinfoList[i - 1].IsCleared;
+                            _ui.m_newGame3.visible = t.PlayCount == 0 ? true : false;
                             break;
                         default:
                             break;

GameClient/Assets/ResIn/UI/ActivityAfternoonTea/ActivityAfternoonTea_atlas0.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 3c3cdbe35548d0740b996841f2a9c403
+guid: d2cb548b95026574785e83626fdf2299
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

GameClient/Assets/ResIn/UI/ActivityAfternoonTea/ActivityAfternoonTea_atlas0_1.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 98e015a6f2875244c87e87970b28c37c
+guid: abf38dde5bf83d148a30c56a530498b5
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

GameClient/Assets/ResIn/UI/ActivityAfternoonTea/ActivityAfternoonTea_atlas0_2.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: bcfb974309fec634abbc1def741e56f7
+guid: 0b01f954a8f28194c9203b26d8e63406
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

GameClient/Assets/ResIn/UI/ActivityAfternoonTea/ActivityAfternoonTea_fui.bytes.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 345e30aff8189e4459edcf1b6028fa72
+guid: c4dd7ab2475d4c44399dc2c8c2fd7be0
 TextScriptImporter:
   externalObjects: {}
   userData: