活动弹窗补充提交

GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/ActivityMainTipsView.cs

@@ -75,7 +75,7 @@ namespace GFGGame
             }
             long curTime = TimeHelper.ServerNow();
             _ui.m_activityTime.text = string.Format("剩余{0}", TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime));
-            _ui.m_icon.url = ResPathUtil.GetActivityPath(showActivity[0].ActivityNotice);
+            _ui.m_icon.url = ResPathUtil.GetActivityPath(showActivity[0].ActivityNotice,"png");
             _ui.m_activityDesc.visible = false;
         }
 

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);3
+            ViewManager.Show<MergeGameView>();
         }
 
         private void OnClickBtnGongGao()
@@ -764,7 +765,7 @@ namespace GFGGame
         {
             UI_ListAdItem item = UI_ListAdItem.Proxy(obj);
 
-            item.m_loaRes.url = ResPathUtil.GetActivityPath(_adIds[index].res);
+            item.m_loaRes.url = ResPathUtil.GetActivityPath(_adIds[index].res,"png");
             if (item.m_loaRes.data == null)
             {
                 item.m_loaRes.onClick.Add(OnBtnAdJump);

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

@@ -105,7 +105,7 @@ namespace GFGGame
         private void ListActivityItemRender(int index, GObject obj)
         {
             UI_ListActivityItem item = UI_ListActivityItem.Proxy(obj);
-            item.m_loaShow.url = ResPathUtil.GetActivityPath(showActivity[index].NoticeTips);
+            item.m_loaShow.url = ResPathUtil.GetActivityPath(showActivity[index].NoticeTips,"png");
             item.m_txtName.text = showActivity[index].res;
             switch (showActivity[index].jumpId)
             {