Sfoglia il codice sorgente

摘星跳转补充

huangxiaoyue 1 anno fa
parent
commit
1245aae9c6

+ 0 - 1
GameClient/Assets/Game/HotUpdate/Data/LuckyBoxDataManager.cs

@@ -7,7 +7,6 @@ namespace GFGGame
     public class LuckyBoxDataManager : SingletonBase<LuckyBoxDataManager>
     {
 
-        public const int BOX_ID_1 = 1;//轮换活动不固定
         public const int BOX_ID_2 = 2;//常驻奖池2
         public const int BOX_ID_3 = 3;//常驻奖池2
 

+ 4 - 4
GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxView.cs

@@ -124,16 +124,16 @@ namespace GFGGame
                 LuckyBoxDataManager.Instance.luckyBoxIds.Insert(0, _activeBoxId);
             }
 
-            int boxId = LuckyBoxDataManager.Instance.luckyBoxIds[1];
+            int boxId = LuckyBoxDataManager.Instance.luckyBoxIds[1];  //默认跳转进来是第二个活动
             if (this.viewData != null)
             {
-                if(boxId != LuckyBoxDataManager.BOX_ID_1)   //是1的时候,就使用轮换活动,不是1就是传入的固定活动
-                    boxId = (int)this.viewData;
+                int index = (int)this.viewData;  //传入的值为第几个活动,不是活动id
+                boxId = LuckyBoxDataManager.Instance.luckyBoxIds[index - 1];//是1的时候,就使用轮换活动,不是1就是传入的固定活动
             }
 
             //新手引导选中第一个活动
             if (GuideDataManager.IsGuideFinish(ConstGuideId.LUCKY_BOX) <= 0) 
-                boxId = LuckyBoxDataManager.Instance.luckyBoxIds[1];
+                boxId = LuckyBoxDataManager.Instance.luckyBoxIds[0];
 
             //第二个活动会有许愿活动出现
             if (_activityId > 0 && boxId == LuckyBoxDataManager.BOX_ID_2)