Browse Source

工作室跳转

zhaoyang 3 years ago
parent
commit
b34343f390

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Controller/GameController.cs

@@ -221,6 +221,7 @@ namespace GFGGame
             DailyTaskSProxy.ReqDailyTaskInfos().Coroutine();
             ActivitySProxy.ReqDailyLoginInfos().Coroutine();
             NoticeSProxy.ReqSystemNoticeList().Coroutine();
+            StudioSProxy.ReqStudioInfos().Coroutine();
 
             EquipDataCache.cacher.autoPlay = StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_AUTO_PLAY) <= 0 ? false : true;
             EquipDataCache.cacher.fightSpeed = StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_AUTO_PLAY_SPEED) <= 1 ? 1 : StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_AUTO_PLAY_SPEED);

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs

@@ -510,7 +510,7 @@ namespace GFGGame
 
             int needCount = cardStarCfg.materiarsArr[index][1];
             int hasCount = ItemDataManager.GetItemNum(cardStarCfg.materiarsArr[index][0]);
-            listItem.m_txtNeedCount.text = StringUtil.GetColorText(needCount.ToString(), hasCount < needCount ? "#D27869" : "#FDF3D7"); ;
+            listItem.m_txtNeedCount.text = StringUtil.GetColorText(needCount.ToString(), hasCount < needCount ? "#FDF3D7" : "#D27869"); ;
             listItem.m_txtHasCount.text = hasCount.ToString();
             listItem.m_btnPlus.visible = false;
             if (listItem.m_btnPlus.data == null)

+ 6 - 1
GameClient/Assets/Game/HotUpdate/Views/CommonGame/ApproachOfItemView.cs

@@ -159,7 +159,12 @@ namespace GFGGame
                             break;
                         }
                         this.Hide();
-                        int type = studioCfg.name == typeof(StudioPropertyView).Name ? 1 : 0;
+                        if (!TimeUtil.CheckDayOfWeek(studioCfg.timeArr))
+                        {
+                            PromptController.Instance.ShowFloatTextPrompt("不在活动周期内");
+                            break;
+                        }
+                        int type = studioCfg.funId == typeof(StudioPropertyView).Name ? 1 : 0;
                         string viewName = "GFGGame." + studioCfg.funId;
                         ViewManager.Show(viewName, new object[] { type, 0 }, _fromeViewDatas);