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

GameClient/Assets/Game/HotUpdate/Views/Notice/NoticeView.cs

@@ -106,7 +106,7 @@ namespace GFGGame
         {
             UI_ListActivityItem item = UI_ListActivityItem.Proxy(obj);
             item.m_loaShow.url = ResPathUtil.GetActivityPath(showActivity[index].NoticeTips,"png");
-            item.m_txtName.text = showActivity[index].res;
+            item.m_txtName.text = "";
             switch (showActivity[index].jumpId)
             {
                 //后续添加其他活动