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

GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/DailyWelfareView.cs

@@ -138,7 +138,7 @@ namespace GFGGame
             }
             else if(openCfg.id == 505 || openCfg.type == 10)
             {
-                item.m_loaIcon.url = ResPathUtil.GetActivityPath("gg_leichong1", "png");;
+                item.m_loaIcon.url = ResPathUtil.GetActivityPath("gg_banner_lc_bjh", "png");;
                 item.m_loaTitle.visible = false;
             }
             else

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

@@ -116,10 +116,12 @@ namespace GFGGame
             {
                 item.m_loaItem.visible = false;
                 item.m_loaIcon.visible = true;
+                item.m_flow.visible = false;
                 item.m_loaIcon.url = string.Format("ui://Studio/{0}", _studioCfg.res);
             }
             item.m_grpLock.visible = index > 0 && !InstanceZonesDataManager.CheckLevelPass(_storyLevelCfgs[index - 1].id);
-            item.m_comFlower.m_c1.selectedIndex = InstanceZonesDataManager.GetStarCountHistory(_storyLevelCfgs[index].id);
+            item.m_comFlower.target.visible = false;//.m_c1.selectedIndex = InstanceZonesDataManager.GetStarCountHistory(_storyLevelCfgs[index].id);
+            item.m_c2.selectedIndex = InstanceZonesDataManager.GetStarCountHistory(_storyLevelCfgs[index].id);
             if (item.m_loaBg.data == null)
             {
                 item.m_loaBg.onClick.Add(OnListItemClick);