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

GameClient/Assets/Editor/ArtsRes/ImportArtResTool.cs

@@ -155,6 +155,10 @@ namespace GFGEditor
         public static string MiniGameTZFETargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/MiniGame/TZFEGame/";
         public static string MiniGameTZFEMd5FileSaveName = "MiniGameTZFEMd5";
 
+        public static string[] MiniGameMergePaths { get { return new string[] { ResRootPath + "MiniGame/MergeGame/" }; } }
+        public static string MiniGameMergeTargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/MiniGame/MergeGame/";
+        public static string MiniGameMergeMd5FileSaveName = "MiniGameMergeMd5";
+
         public static void Import()
         {
             var md5Path = ImportArtResTool.Md5FilePath;
@@ -278,6 +282,9 @@ namespace GFGEditor
             EditorUtility.DisplayProgressBar("进度", "正在导入小游戏资源", 1);
             ImportRes(MiniGameTZFEPaths, MiniGameTZFETargetPath, MiniGameTZFEMd5FileSaveName);
 
+            EditorUtility.DisplayProgressBar("进度", "正在导入小游戏资源", 1);
+            ImportRes(MiniGameMergePaths, MiniGameMergeTargetPath, MiniGameMergeMd5FileSaveName);
+
             EditorUtility.ClearProgressBar();
             AssetDatabase.Refresh();
             Debug.LogWarning("导入美术资源成功!");

GameClient/Assets/Editor/Excel/Scanner/ItemApproachScanner.cs

@@ -578,7 +578,7 @@ namespace GFGEditor
             return false;
         }
         /// <summary>
-        /// 检测商城-豆包卡是否产出该物品
+        /// 检测商城-红包卡是否产出该物品
         /// </summary>
         /// <param name="itemId"></param>
         /// <returns></returns>

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

@@ -98,7 +98,7 @@ namespace GFGGame
                     }
                     else
                     {
-                        posItems[i] = "豆包卡开启";
+                        posItems[i] = "红包卡开启";
                     }
                 }
                 else if (GetPosType(i) == MonthCardType.BlackGold)
@@ -109,7 +109,7 @@ namespace GFGGame
                     }
                     else
                     {
-                        posItems[i] = "阿福卡开启";
+                        posItems[i] = "福气卡开启";
                     }
                 }
             }

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

@@ -641,7 +641,7 @@ namespace GFGGame
         }
 
         /// <summary>
-        /// 商城-月卡-豆包卡
+        /// 商城-月卡-红包卡
         /// </summary>
         /// <returns></returns>
         public bool GetGoldCardRewardRed()
@@ -649,7 +649,7 @@ namespace GFGGame
             return RoleDataManager.CheckIsMonthCardOpenByType(MonthCardType.Gold) && GameGlobal.myNumericComponent.GetAsInt(NumericType.MonthCardGoldReward) <= 0;
         }
         /// <summary>
-        /// 商城-月卡-阿福卡
+        /// 商城-月卡-福气卡
         /// </summary>
         /// <returns></returns>
         public bool GetBlackCardRewardRed()
@@ -657,7 +657,7 @@ namespace GFGGame
             return RoleDataManager.CheckIsMonthCardOpenByType(MonthCardType.BlackGold) && GameGlobal.myNumericComponent.GetAsInt(NumericType.MonthCardBlackGoldReward) <= 0;
         }
         /// <summary>
-        /// 商城-月卡-阿福卡-单品奖励
+        /// 商城-月卡-福气卡-单品奖励
         /// </summary>
         /// <returns></returns>
         public bool GetBlackCardClothingRed()

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

@@ -280,11 +280,11 @@ namespace GFGGame
                 }
                 else if (GetPosType(i) == MonthCardType.Gold && !RoleDataManager.CheckIsMonthCardOpenByType(MonthCardType.Gold))
                 {
-                    posItems[i] = "豆包卡开启";
+                    posItems[i] = "红包卡开启";
                 }
                 else if (GetPosType(i) == MonthCardType.BlackGold && !RoleDataManager.CheckIsMonthCardOpenByType(MonthCardType.BlackGold))
                 {
-                    posItems[i] = "阿福卡开启";
+                    posItems[i] = "福气卡开启";
                 }
             }
             return posItems;

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

@@ -203,7 +203,7 @@ namespace GFGGame
             }
             else if (shopCfg.lockType == LockType.MONTH_CARD_TYPE)
             {
-                return string.Format("开通{0}解锁", shopCfg.lockValue == MonthCardType.Gold ? "豆包卡" : "阿福卡");
+                return string.Format("开通{0}解锁", shopCfg.lockValue == MonthCardType.Gold ? "红包卡" : "福气卡");
             }
             else if (shopCfg.lockType == LockType.AREND_GRADE)
             {

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

@@ -50,7 +50,7 @@ namespace GFGGame
         {
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(GlobalCfgArray.globalCfg.costIdBuyFightTimes);
 
-            _ui.m_txtMessage.text = string.Format("是否使用{0}{1}增加1次飞花令挑战次数？ \n\u3000\u3000\u3000\u3000（开通阿福卡可储存次数）", GlobalCfgArray.globalCfg.costNumBuyFightTimes, itemCfg.name);
+            _ui.m_txtMessage.text = string.Format("是否使用{0}{1}增加1次飞花令挑战次数？ \n\u3000\u3000\u3000\u3000（开通福气卡可储存次数）", GlobalCfgArray.globalCfg.costNumBuyFightTimes, itemCfg.name);
             _ui.m_txtTips.text = string.Format("(今天已购买{0}/{1}次)", GlobalCfgArray.globalCfg.limitDailyBuyFightTimes - RoleDataManager.ArenaBuyFightTimes, GlobalCfgArray.globalCfg.limitDailyBuyFightTimes);
         }
         private void OnClickBtnSure()

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

@@ -153,13 +153,13 @@ namespace GFGGame
             int index = (int)obj.data;
             if (RoleInfoManager.GetPosType(index) == MonthCardType.Gold && !RoleDataManager.CheckIsMonthCardOpenByType(MonthCardType.Gold))
             {
-                // PromptController.Instance.ShowFloatTextPrompt("豆包卡开启");
+                // PromptController.Instance.ShowFloatTextPrompt("红包卡开启");
                 ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_MONTH_CARD, ConstStoreSubId.STORE_MONTH_GOLD_CARD });
                 return;
             }
             if (RoleInfoManager.GetPosType(index) == MonthCardType.BlackGold && !RoleDataManager.CheckIsMonthCardOpenByType(MonthCardType.BlackGold))
             {
-                // PromptController.Instance.ShowFloatTextPrompt("阿福卡开启");
+                // PromptController.Instance.ShowFloatTextPrompt("福气卡开启");
                 ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_MONTH_CARD, ConstStoreSubId.STORE_MONTH_BLACK_CARD });
                 return;
             }

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

@@ -115,7 +115,7 @@ namespace GFGGame
 
             if (GameGlobal.myNumericComponent.GetAsLong(NumericType.MonthCardBlackGoldEndTime) < TimeHelper.ServerNow())
             {
-                PromptController.Instance.ShowFloatTextPrompt("开通阿福卡可领");
+                PromptController.Instance.ShowFloatTextPrompt("开通福气卡可领");
                 return;
             }
             ShopSProxy.ReqGetMonthCardItem(month).Coroutine();

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

@@ -113,7 +113,7 @@ namespace GFGGame
                             privilegeCount++;
                         }
                     }
-                    _ui.m_txtDesc.SetVar("value", "豆包卡").FlushVars();
+                    _ui.m_txtDesc.SetVar("value", "红包卡").FlushVars();
                     _ui.m_txtMoneyCount.text = privilegeCfg.value1Arr[0].ToString();
                     _ui.m_txtDailyMoneyCount.text = privilegeCfg.value1Arr[1].ToString();
                     _ui.m_btnBlackReward.visible = false;
@@ -131,7 +131,7 @@ namespace GFGGame
                             privilegeCount++;
                         }
                     }
-                    _ui.m_txtDesc.SetVar("value", "阿福卡").FlushVars();
+                    _ui.m_txtDesc.SetVar("value", "福气卡").FlushVars();
                     _ui.m_txtMoneyCount.text = privilegeCfg.value2Arr[0].ToString();
                     _ui.m_txtDailyMoneyCount.text = privilegeCfg.value2Arr[1].ToString();
                     _ui.m_btnBlackReward.visible = true;

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioBuyNumView.cs

@@ -80,8 +80,8 @@ namespace GFGGame
                 if (privilegeCfgs[i].paramsArr[0] == _limitId)
                 {
                     _ui.m_txtNum1.visible = true;
-                    string str0 = privilegeCfgs[i].value1Arr[0] > 0 ? string.Format("豆包卡+{0}次", privilegeCfgs[i].value1Arr[0]) : "";
-                    string str1 = privilegeCfgs[i].value2Arr[0] > 0 ? string.Format("阿福卡+{0}次", privilegeCfgs[i].value2Arr[0]) : "";
+                    string str0 = privilegeCfgs[i].value1Arr[0] > 0 ? string.Format("红包卡+{0}次", privilegeCfgs[i].value1Arr[0]) : "";
+                    string str1 = privilegeCfgs[i].value2Arr[0] > 0 ? string.Format("福气卡+{0}次", privilegeCfgs[i].value2Arr[0]) : "";
                     _ui.m_txtNum0.text = string.Format("1.{0}{1}{2}", str0, !string.IsNullOrEmpty(str0) && !string.IsNullOrEmpty(str1) ? "," : "", str1);
                     _ui.m_txtNum1.text = string.Format("2.道具兑换(今天已兑换{0}/{1}次)", _limitData.BuyTimes, _limitCfg.buyNum);
                     break;