Browse Source

修复寻访奇胜的道具——路引的获取来源的报错
GameFunctionCfg中添加WEEKLY_TASK配置

leiyasi 1 year ago
parent
commit
72dbdcd19d

+ 5 - 3
GameClient/Assets/Game/HotUpdate/Views/CommonGame/ApproachView.cs

@@ -1,6 +1,8 @@
 using System.Collections.Generic;
 using System.Collections.Generic;
 using FairyGUI;
 using FairyGUI;
 using UI.CommonGame;
 using UI.CommonGame;
+using UnityEngine;
+
 namespace GFGGame
 namespace GFGGame
 {
 {
     public class ApproachView
     public class ApproachView
@@ -281,7 +283,7 @@ namespace GFGGame
                         bool isPass = InstanceZonesDataManager.CheckLevelPass(suitCfg.syntheticStoryLevelId);
                         bool isPass = InstanceZonesDataManager.CheckLevelPass(suitCfg.syntheticStoryLevelId);
                         if (suitCfg.syntheticStoryLevelId > 0 && !isPass)
                         if (suitCfg.syntheticStoryLevelId > 0 && !isPass)
                         {
                         {
-                            isJump = ViewManager.Show<SuitSyntheticView>(suitId, _fromeViewDatas); 
+                            isJump = ViewManager.Show<SuitSyntheticView>(suitId, _fromeViewDatas);
                         }
                         }
                         else
                         else
                         {
                         {
@@ -299,7 +301,7 @@ namespace GFGGame
                     {
                     {
                         return;
                         return;
                     }
                     }
-                    isJump = ViewManager.Show<SuitGuideView>(null, _fromeViewDatas); 
+                    isJump = ViewManager.Show<SuitGuideView>(null, _fromeViewDatas);
 
 
                     break;
                     break;
                 case ConstFunctionId.TAO_ZHUANG_HE_CHENG:
                 case ConstFunctionId.TAO_ZHUANG_HE_CHENG:
@@ -312,7 +314,7 @@ namespace GFGGame
                     isJump = ViewManager.Show<TaskView>(null, _fromeViewDatas);
                     isJump = ViewManager.Show<TaskView>(null, _fromeViewDatas);
                     break;
                     break;
                 case ConstFunctionId.WEEKLY_TASK:
                 case ConstFunctionId.WEEKLY_TASK:
-                    isJump = ViewManager.Show<TaskView>(new object[] { 1}, _fromeViewDatas);
+                    isJump = ViewManager.Show<TaskView>(new object[] { 1 }, _fromeViewDatas);
                     break;
                     break;
                 case ConstFunctionId.LEAGUE_PRAY:
                 case ConstFunctionId.LEAGUE_PRAY:
                     isJump = ViewManager.Show<LeaguePrayView>(null, _fromeViewDatas);
                     isJump = ViewManager.Show<LeaguePrayView>(null, _fromeViewDatas);

+ 3 - 2
GameClient/Assets/Game/HotUpdate/Views/FieldGuide/DressUpGuideView.cs

@@ -19,7 +19,7 @@ namespace GFGGame
         // 上次点击单选按钮的index
         // 上次点击单选按钮的index
         private struct LastClickIndex
         private struct LastClickIndex
         {
         {
-            public int typeIndex;
+            public int typeIndex;   // 菜单类型:一级/二级
             public int index;
             public int index;
         }
         }
 
 
@@ -302,7 +302,8 @@ namespace GFGGame
 
 
         private void FilterItems(EventContext context)
         private void FilterItems(EventContext context)
         {
         {
-            if(_lastClickIndex.typeIndex == 1)
+            // 过滤之前,需要更新_itemIdList为全部物品
+            if (_lastClickIndex.typeIndex == 1)
             {
             {
                 UpdateItemIdListByType1(_lastClickIndex.index);
                 UpdateItemIdListByType1(_lastClickIndex.index);
             }
             }

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/Task/TaskView.cs

@@ -71,7 +71,7 @@ namespace GFGGame
             int selectedIndex = 0;
             int selectedIndex = 0;
             if (viewData != null)
             if (viewData != null)
             {
             {
-                var t = viewData as int[];
+                var t = viewData as object[];
                 if(t != null && t.Length > 0)
                 if(t != null && t.Length > 0)
                 {
                 {
                     selectedIndex = (int)t[0];
                     selectedIndex = (int)t[0];