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

GameClient/Assets/Game/HotUpdate/ServerProxy/TimeTracingSProxy.cs

@@ -187,7 +187,15 @@ namespace GFGGame
             {
                 if(response.AllKs[i] == 6200123)
                 {
-                    TimeTracingDataManager.SuitID = (int)response.AllVs[i]; 
+                    TimeTracingDataManager.SuitID = (int)response.AllVs[i];
+                    List<ActivityOpenCfg> activityCfgList = ActivityOpenCfgArray.Instance.GetCfgsBytype(21);
+                    foreach(var item in activityCfgList)
+                    {
+                        if(item.paramsArr[0] == (int)response.AllVs[i])
+                        {
+                            TimeTracingDataManager._currentChapterId = item.params3Arr[0];
+                        }
+                    }
                     return true;
                 }
             }

GameClient/Assets/Game/HotUpdate/Views/ActivityThemeLuckyBox/ActivityThemeLuckyBoxView.cs

@@ -147,7 +147,7 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("活动已结束");
                 return;
             }
-            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_GIFT_BAG, ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY });
+            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_EXCHANGE, ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY });
         }
 
         private void UpdateTime(object param = null)

GameClient/Assets/Game/HotUpdate/Views/Common/Controller/ValueBarController.cs

@@ -227,6 +227,7 @@ namespace GFGGame
                 case ConstItemID.GET_TICKETS:
                 case ConstItemID.YUANXIAO_GAME_CONSUME:
                 case ConstItemID.YUANXIAO_REWARD:
+                case ConstItemID.SYJH_PropID:
                     button.m_imgAdd.visible = true;
                     break;
                 default:

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