雅集材料来源

GameClient/Assets/Editor/Excel/Scanner/ItemApproachScanner.cs

@@ -19,7 +19,7 @@ namespace GFGEditor
         public static void startScan()
         {
             ItemCfg[] dataArray = ItemCfgArray.Instance.dataArray;
-            GetApproachCall[] actions = new GetApproachCall[] { GetClothingShopApproach, GetStoryLevelApproach, CheckStoreApproach, GetClothingSyntheticApproach, GetSuitGuideApproach, GetSuitSyntheticApproach, GetClothingDecomposeApproach, CheckClothingFosterApproach, CheckDailyTaskApproach, GetZhaiXingApproach, GetLeaguePrayApproach, GetLeagueAnswerApproach };
+            GetApproachCall[] actions = new GetApproachCall[] { GetClothingShopApproach, GetLeaguePrayApproach, GetLeagueAnswerApproach, CheckStoreApproach, GetClothingSyntheticApproach, GetSuitGuideApproach, GetSuitSyntheticApproach, GetClothingDecomposeApproach, CheckClothingFosterApproach, CheckDailyTaskApproach, GetZhaiXingApproach, GetStoryLevelApproach };
             Dictionary<SuitCfg, List<int>> suitDic = new Dictionary<SuitCfg, List<int>>();
             int suitPartTotalCount = 0;
             foreach (ItemCfg cfg in dataArray)

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

@@ -51,7 +51,12 @@ namespace GFGGame
         }
         private void OnClickLeagueContribuation()
         {
-            object[] sourceDatas = new object[] { ConstItemID.LEAGUE_CONTRIBUTION, new object[] { typeof(LeagueSkillUpView).FullName, null } };
+            object[] sourceDatas = new object[] { ConstItemID.LEAGUE_CONTRIBUTION, null };
+            GoodsItemTipsController.ShowItemTips(ConstItemID.LEAGUE_CONTRIBUTION, sourceDatas);
+        }
+        private void OnClickLeagueContribuation(object[] gobackParam = null)
+        {
+            object[] sourceDatas = new object[] { ConstItemID.LEAGUE_CONTRIBUTION, gobackParam };
             GoodsItemTipsController.ShowItemTips(ConstItemID.LEAGUE_CONTRIBUTION, sourceDatas);
         }
 
@@ -225,7 +230,12 @@ namespace GFGGame
                     OnClickGallery();
                     break;
                 case ConstItemID.LEAGUE_CONTRIBUTION:
-                    OnClickLeagueContribuation();
+                    object[] param = null;
+                    if (ViewManager.isViewOpen(typeof(StoreView).FullName) && ViewManager.isViewOpen(typeof(StoreExchangeView).FullName))
+                    {
+                        param = new object[] { typeof(StoreView).FullName, new object[] { ConstStoreTabId.STORE_EXCHANGE, ConstStoreSubId.STORE_EXCHANGE_LEAGUE } };
+                    }
+                    OnClickLeagueContribuation(param);
                     break;
                 case ConstItemID.LUCKYBOX_COST_0:
                 case ConstItemID.LUCKYBOX_COST_1:

GameClient/Assets/Game/HotUpdate/Views/CommonGame/ApproachView.cs

@@ -317,7 +317,17 @@ namespace GFGGame
                     isJump = ViewManager.Show<LeaguePrayView>(null, _fromeViewDatas);
                     break;
                 case ConstFunctionId.LEAGUE_ANSWER:
-                    isJump = ViewManager.Show<LeagueAnswerView>(null, _fromeViewDatas);
+                    if (LeagueDataManager.Instance.Type == LeagueJoinType.Join)
+                    {
+                        ViewManager.Show<LeagueView>(null, _fromeViewDatas);
+                        isJump = ViewManager.Show<LeagueAnswerView>();
+                    }
+                    else
+                    {
+                        if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(nameof(LeagueView))) return;
+                        PromptController.Instance.ShowFloatTextPrompt("暂未加入雅集");
+                    }
+
                     break;
             }
             if (isJump)