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

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]);