小游戏补充提交

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

@@ -11,6 +11,9 @@ namespace GFGGame
         public List<ItemInfoProto> itemList = new List<ItemInfoProto>();
         public List<GameInfoProto> gameinfoList = new List<GameInfoProto>();
 
+        //合成游戏
+        public int taskID = 40001;
+
         public bool GetRewardRot()
         {
             foreach(GameInfoProto t in gameinfoList)

GameClient/Assets/Game/HotUpdate/Utils/ResPathUtil.cs

@@ -285,9 +285,9 @@ namespace GFGGame
             return $"{ANIMATION_DIR_PATH}/{dir}/{res}.{extName}";
         }
 
-        public static string GetMiniGamePicPath(string res, string extName = "png")
+        public static string GetMiniGamePicPath(string res, string dir = null, string extName = "png")
         {
-            return $"{MINIGAME_DIR_PATH}{res}.{extName}";
+            return $"{MINIGAME_DIR_PATH}{dir}/{res}.{extName}";
         }
 
         public static string GetHUARONGDAOPicPath(string res, string extName = "png")

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

@@ -426,7 +426,8 @@ namespace GFGGame
 
         private void OnClickBtnHaoYou()
         {
-            ViewManager.Show<FriendView>(null, true);
+            //ViewManager.Show<FriendView>(null, true);
+            ViewManager.Show<MergeGameView>();
         }
 
         private void OnClickBtnGongGao()

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

@@ -183,7 +183,7 @@ namespace GFGGame
             _effectRemoveList.Add(_effectUI2);
             cardItem.m_removeEffect.visible = false;
 
-            cardItem.m_card.GetChild("icon").icon = ResPathUtil.GetMiniGamePicPath(CardCfgArray.Instance.dataArray[cardArray[index]].resName);
+            cardItem.m_card.GetChild("icon").icon = ResPathUtil.GetMiniGamePicPath(CardCfgArray.Instance.dataArray[cardArray[index]].resName,"CardGame");
             if (cardItem.target.data == null)
             {
                 cardItem.target.onClick.Add(OnClickCardItem);
@@ -252,6 +252,7 @@ namespace GFGGame
         }
 
         private void UpdateList()
+
         {
             _ui.m_cardList.columnCount = columns;
             _ui.m_cardList.numItems = cardNum;

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

@@ -110,11 +110,30 @@ namespace GFGGame
             {
                 _ui.m_rewardBtn.target.visible = true;
             }
-            _ui.m_ticket.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(3000017).res);
+
+            CardGame cardGameDate = CardGameArray.Instance.GetCfgsBytypeAndsubType(GameType[0],GameType[1])[0];
+            int consumeID;
+            if (cardGameDate.comsumeStartArr.Length > 0)
+            {
+                NumTicketOne = cardGameDate.comsumeStartArr[0][1];
+                consumeID = cardGameDate.comsumeStartArr[0][0];
+            }
+            else if (cardGameDate.comsumePassArr.Length > 0)
+            {
+                NumTicketOne = cardGameDate.comsumePassArr[0][1];
+                consumeID = cardGameDate.comsumePassArr[0][0];
+            }
+            else
+            {
+                NumTicketOne = 3;
+                consumeID = 3000017;
+            }
+
+            _ui.m_ticket.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(consumeID).res);
             _ui.m_needNum1.text = NumTicketOne.ToString();
+            _ui.m_needIcon1.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(consumeID).res);
+            _ui.m_needIcon2.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(consumeID).res);
             _ui.m_needNum2.text = NumTicketTwo.ToString();
-            _ui.m_needIcon1.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(3000017).res);
-            _ui.m_needIcon2.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(3000017).res);
             _ui.m_needNum2.visible = false;
             _ui.m_needIcon2.visible = false;
             _ui.m_game1.url = "";
@@ -123,7 +142,7 @@ namespace GFGGame
             _ui.m_tipsTwo.data = 300027;
 
             ItemData item;
-            if (BagDataManager.Instance.GetBagData().TryGetValue(3000017,out item))
+            if (BagDataManager.Instance.GetBagData().TryGetValue(consumeID, out item))
             {
                 _ui.m_ticketNum.text = item.num.ToString();
             }

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

@@ -76,6 +76,7 @@ namespace GFGGame
         private void UpdateView()
         {
             ItemCfg itemCfg;
+            string consumeText;
             switch (gameType)
             {
                 case 1:
@@ -83,18 +84,46 @@ namespace GFGGame
                     CustemsNum[0] = cardGameDate.timeStar3;
                     CustemsNum[1] = cardGameDate.timeStar2;
                     CustemsNum[2] = cardGameDate.timeStar1;
-                    itemCfg = ItemCfgArray.Instance.GetCfg(cardGameDate.comsumeStartArr[0][0]);
+                    if (cardGameDate.comsumeStartArr.Length > 0)
+                    {
+                        itemCfg = ItemCfgArray.Instance.GetCfg(cardGameDate.comsumeStartArr[0][0]);
+                        consumeText = cardGameDate.comsumeStartArr[0][1].ToString();
+                    }
+                    else if (cardGameDate.comsumePassArr.Length > 0)
+                    {
+                        itemCfg = ItemCfgArray.Instance.GetCfg(cardGameDate.comsumePassArr[0][0]);
+                        consumeText = cardGameDate.comsumePassArr[0][1].ToString();
+                    }
+                    else
+                    {
+                        itemCfg = ItemCfgArray.Instance.GetCfg(3000017);
+                        consumeText = "";
+                    }
                     _ui.m_consumeIcon.url = ResPathUtil.GetCommonGameResPath(itemCfg.res);
-                    _ui.m_consumeTxt.text = cardGameDate.comsumeStartArr[0][1].ToString();
+                    _ui.m_consumeTxt.text = consumeText;
                     break;
                 case 2:
                     Merge2048Game MergeGameDate = Merge2048GameArray.Instance.GetCfg(gameID);
                     CustemsNum[0] = MergeGameDate.timeStar3;
                     CustemsNum[1] = MergeGameDate.timeStar2;
                     CustemsNum[2] = MergeGameDate.timeStar1;
-                    itemCfg = ItemCfgArray.Instance.GetCfg(MergeGameDate.comsumeStartArr[0][0]);
+                    if (MergeGameDate.comsumeStartArr.Length > 0)
+                    {
+                        itemCfg = ItemCfgArray.Instance.GetCfg(MergeGameDate.comsumeStartArr[0][0]);
+                        consumeText = MergeGameDate.comsumeStartArr[0][1].ToString();
+                    }
+                    else if (MergeGameDate.comsumePassArr.Length > 0)
+                    {
+                        itemCfg = ItemCfgArray.Instance.GetCfg(MergeGameDate.comsumePassArr[0][0]);
+                        consumeText = MergeGameDate.comsumePassArr[0][1].ToString();
+                    }
+                    else
+                    {
+                        itemCfg = ItemCfgArray.Instance.GetCfg(3000017);
+                        consumeText = "";
+                    }
                     _ui.m_consumeIcon.url = ResPathUtil.GetCommonGameResPath(itemCfg.res);
-                    _ui.m_consumeTxt.text = MergeGameDate.comsumeStartArr[0][1].ToString();
+                    _ui.m_consumeTxt.text = consumeText;
                     break;
                 case 3:
 

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

@@ -67,7 +67,7 @@ namespace GFGGame
             }
             for(int i = target; i>=2 ; i= i/2 )
             {
-                iconDic[i].url = ResPathUtil.GetMiniGamePicPath(Merge2048CfgArray.Instance.GetCfgsByidAndnum(srcID,i)[0].resName);
+                iconDic[i].url = ResPathUtil.GetMiniGamePicPath(Merge2048CfgArray.Instance.GetCfgsByidAndnum(srcID,i)[0].resName, "TZFEGame");
             }
         }
         protected override void OnHide()

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

@@ -69,16 +69,37 @@ namespace GFGGame
         }
         private void UpdateView()
         {
-            _ui.m_needNum1.text = gameDate[0].comsumeStartArr[0][1].ToString();
-            _ui.m_needNum2.text = gameDate[1].comsumeStartArr[0][1].ToString();
-            _ui.m_needNum3.text = gameDate[2].comsumeStartArr[0][1].ToString();
-            _ui.m_needIcon1.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(3000017).res);
-            _ui.m_needIcon2.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(3000017).res);
-            _ui.m_needIcon3.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(3000017).res);
+            if (gameDate[0].comsumeStartArr.Length > 0)
+            {
+                _ui.m_needNum1.text = gameDate[0].comsumeStartArr[0][1].ToString();
+                _ui.m_needNum2.text = gameDate[1].comsumeStartArr[0][1].ToString();
+                _ui.m_needNum3.text = gameDate[2].comsumeStartArr[0][1].ToString();
+                _ui.m_needIcon1.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(gameDate[0].comsumeStartArr[0][0]).res);
+                _ui.m_needIcon2.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(gameDate[1].comsumeStartArr[0][0]).res);
+                _ui.m_needIcon3.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(gameDate[2].comsumeStartArr[0][0]).res);
+            }
+            else if(gameDate[0].comsumePassArr.Length > 0)
+            {
+                _ui.m_needNum1.text = gameDate[0].comsumePassArr[0][1].ToString();
+                _ui.m_needNum2.text = gameDate[1].comsumePassArr[0][1].ToString();
+                _ui.m_needNum3.text = gameDate[2].comsumePassArr[0][1].ToString();
+                _ui.m_needIcon1.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(gameDate[0].comsumePassArr[0][0]).res);
+                _ui.m_needIcon2.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(gameDate[1].comsumePassArr[0][0]).res);
+                _ui.m_needIcon3.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(gameDate[2].comsumePassArr[0][0]).res);
+            }
+            else
+            {
+                _ui.m_needNum1.text = "";
+                _ui.m_needNum2.text = "";
+                _ui.m_needNum3.text = "";
+                _ui.m_needIcon1.url = "";
+                _ui.m_needIcon2.url = "";
+                _ui.m_needIcon3.url = "";
+            }
 
-            _ui.m_game1.url = ResPathUtil.GetMiniGamePicPath(Merge2048CfgArray.Instance.GetCfgsByidAndnum(gameDate[0].subType, gameDate[0].targetNum)[0].resName);
-            _ui.m_game2.url = ResPathUtil.GetMiniGamePicPath(Merge2048CfgArray.Instance.GetCfgsByidAndnum(gameDate[1].subType, gameDate[1].targetNum)[0].resName);
-            _ui.m_game3.url = ResPathUtil.GetMiniGamePicPath(Merge2048CfgArray.Instance.GetCfgsByidAndnum(gameDate[2].subType, gameDate[2].targetNum)[0].resName);
+            _ui.m_game1.url = ResPathUtil.GetMiniGamePicPath(Merge2048CfgArray.Instance.GetCfgsByidAndnum(gameDate[0].subType, gameDate[0].targetNum)[0].resName, "TZFEGame");
+            _ui.m_game2.url = ResPathUtil.GetMiniGamePicPath(Merge2048CfgArray.Instance.GetCfgsByidAndnum(gameDate[1].subType, gameDate[1].targetNum)[0].resName, "TZFEGame");
+            _ui.m_game3.url = ResPathUtil.GetMiniGamePicPath(Merge2048CfgArray.Instance.GetCfgsByidAndnum(gameDate[2].subType, gameDate[2].targetNum)[0].resName, "TZFEGame");
             OnCheckChange();
             _ui.m_tipsOne.data = 300027;
         }

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

@@ -144,7 +144,7 @@ namespace GFGGame
             CustemsNum[1] = Merge2048GameArray.Instance.GetCfg(gameID).timeStar2;
             CustemsNum[2] = Merge2048GameArray.Instance.GetCfg(gameID).timeStar1;
             _ui.m_star3.url = "ui://MiniGame/tb_zx_pt_star";
-            _ui.m_target.url = ResPathUtil.GetMiniGamePicPath(Merge2048CfgArray.Instance.GetCfgsByidAndnum(gameDate.subType, targetNum)[0].resName);
+            _ui.m_target.url = ResPathUtil.GetMiniGamePicPath(Merge2048CfgArray.Instance.GetCfgsByidAndnum(gameDate.subType, targetNum)[0].resName, "TZFEGame");
             _ui.m_score.text = string.Format("分数：{0}", score.ToString());
             _ui.m_score.visible = false;
             _ui.m_time.visible = false;
@@ -176,7 +176,7 @@ namespace GFGGame
             else
             {
                 //numItem.m_icon.url = string.Format("ui://MiniGame/sgll2_{0}", Map[x, y]);
-                numItem.m_icon.url = ResPathUtil.GetMiniGamePicPath(Merge2048CfgArray.Instance.GetCfgsByidAndnum(gameDate.subType, Map[x, y])[0].resName);
+                numItem.m_icon.url = ResPathUtil.GetMiniGamePicPath(Merge2048CfgArray.Instance.GetCfgsByidAndnum(gameDate.subType, Map[x, y])[0].resName, "TZFEGame");
                 numItem.m_icon.visible = true;
             }
             //播放生成和合并动效