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

GameClient/Assets/Editor/ArtsRes/ImportArtResTool.cs

@@ -55,7 +55,7 @@ namespace GFGEditor
         public static string PicSMd5FileSaveName = "PicSMd5";
 
 
-        public static string[] BgSrcPaths { get { return new string[] { ResRootPathDressUp + "scene/" }; } }
+        public static string[] BgSrcPaths { get { return new string[] { ResRootPath + "scene/" }; } }
         public static string BgTargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/DressUp/";
         public static string BgMd5FileSaveName = "BgMd5";
 

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

@@ -34,8 +34,8 @@ namespace GFGEditor
                 //物品
                 foreach (ItemCfg cfg in dataArray)
                 {
-                    var names = new string[] { nameof(cfg.subType), nameof(cfg.itemType), nameof(cfg.approach) };
-                    var values = new string[] { "" + cfg.subType, "" + cfg.itemType, "" + cfg.approach };
+                    var names = new string[] { nameof(cfg.subType), nameof(cfg.itemType), nameof(cfg.approach), nameof(cfg.isHide) };
+                    var values = new string[] { "" + cfg.subType, "" + cfg.itemType, "" + cfg.approach, "" + cfg.isHide };
                     SQLiteHelper.Instance.UpdateValues(nameof(ItemCfgArray), names, values, nameof(cfg.id), cfg.id.ToString());
                 }
                 //套装
@@ -87,6 +87,7 @@ namespace GFGEditor
                 suitDic[suitCfg] = partsList;
             }
             partsList.Add(itemCfg.id);
+            itemCfg.isHide = suitCfg.isHide;
         }
 
         private static void HandleItemApproch(ItemCfg cfg, GetApproachCall[] actions)

GameClient/Assets/Game/HotUpdate/Views/League/LeagueChangeNameView.cs

@@ -128,6 +128,13 @@ namespace GFGGame
                     PromptController.Instance.ShowFloatTextPrompt("雅集名字仅允许汉字、数字、下划线");
                     return;
                 }
+                
+                //判断是否和旧的名字一样
+                if (leagueName == LeagueDataManager.Instance.LeagueData.Name)
+                {
+                    PromptController.Instance.ShowFloatTextPrompt("雅集名字不可重名");
+                    return;
+                }
 
                 int needCount = GlobalCfgArray.globalCfg.consumeChangeNameArr[0][1];
                 long hasCount = ItemDataManager.GetItemNum(GlobalCfgArray.globalCfg.consumeChangeNameArr[0][0]);

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

@@ -157,8 +157,8 @@ namespace GFGGame
             // _btnStudio.onClick.Add(OnClickBtnStudio);
             // _btnField.onClick.Add(OnClickBtnField);
             _btnBag.onClick.Add(OnClickBtnBag);
-            _ui.m_btnGiftBag1.target.onClick.Add(OnClickBtnGiftBag1);
-            _ui.m_btnGiftBag2.target.onClick.Add(OnClickBtnGiftBag2);
+            _ui.m_btnGiftBag1.target.onClick.Add(OnClickBtnGiftBag2);
+            _ui.m_btnGiftBag2.target.onClick.Add(OnClickBtnGiftBag1);
 
             _ui.m_loaRight.target.onClick.Add(MoveLeft);
             _ui.m_loaLeft.target.onClick.Add(MoveRight);
@@ -721,12 +721,12 @@ namespace GFGGame
                 .Where(a => a.EndTime > TimeInfo.Instance.ServerNow()).ToList();
             if (list.Count == 0)
             {
-                _ui.m_btnGiftBag1.target.visible = false;
+                _ui.m_btnGiftBag2.target.visible = false;
             }
             else
             {
-                _ui.m_btnGiftBag1.m_txtTime.text = TimeUtil.GetTimeLeft(TimeInfo.Instance.ServerNow(), list[0].EndTime);
-                _ui.m_btnGiftBag1.target.visible = true;
+                _ui.m_btnGiftBag2.m_txtTime.text = TimeUtil.GetTimeLeft(TimeInfo.Instance.ServerNow(), list[0].EndTime);
+                _ui.m_btnGiftBag2.target.visible = true;
             }
         }
 
@@ -739,12 +739,12 @@ namespace GFGGame
                 .Where(a => a.EndTime > TimeInfo.Instance.ServerNow()).ToList();
             if (list.Count == 0)
             {
-                _ui.m_btnGiftBag2.target.visible = false;
+                _ui.m_btnGiftBag1.target.visible = false;
             }
             else
             {
-                _ui.m_btnGiftBag2.m_txtTime.text = TimeUtil.GetTimeLeft(TimeInfo.Instance.ServerNow(), list[0].EndTime);
-                _ui.m_btnGiftBag2.target.visible = true;
+                _ui.m_btnGiftBag1.m_txtTime.text = TimeUtil.GetTimeLeft(TimeInfo.Instance.ServerNow(), list[0].EndTime);
+                _ui.m_btnGiftBag1.target.visible = true;
             }
         }