开服活动的抽奖

GameClient/Assets/Game/HotUpdate/Data/ActivityDataManager.cs

@@ -112,6 +112,12 @@ namespace GFGGame
                     stateA = ActivityDataManager.Instance.luckyActTsyBonusState.ContainsKey(a.num) ? 1 : -1;
                     stateB = ActivityDataManager.Instance.luckyActTsyBonusState.ContainsKey(b.num) ? 1 : -1;
                 }
+                else if (typeId == ConstLimitTimeActivityType.ActLimitStlyc)
+                {
+                    allPlayTimes = ActivityDataManager.Instance.allTsyPlayTimes;// GameGlobal.myNumericComponent.GetAsInt(NumericType.TotalRechargeScore);
+                    stateA = ActivityDataManager.Instance.luckyActTsyBonusState.ContainsKey(a.num) ? 1 : -1;
+                    stateB = ActivityDataManager.Instance.luckyActTsyBonusState.ContainsKey(b.num) ? 1 : -1;
+                }
 
                 if (allPlayTimes >= a.num && allPlayTimes < b.num && stateA < 0) return -1;
                 if (allPlayTimes >= b.num && allPlayTimes < a.num && stateB < 0) return 1;

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

@@ -90,7 +90,8 @@ namespace GFGGame
                 if (response.Error == ErrorCode.ERR_Success)
                 {
                     var activityCfg = ActivityOpenCfgArray.Instance.GetCfg(response.ActivityId);
-                    if (activityCfg.type == ConstLimitTimeActivityType.ActLimitLuckyBox) { 
+                    if (activityCfg.type == ConstLimitTimeActivityType.ActLimitLuckyBox)
+                    {
                         if (ActivityDataManager.Instance.actLuckyBoxId != response.ActivityId)
                         {
                             ActivityDataManager.Instance.luckyBoxActBonusState.Clear();
@@ -117,6 +118,10 @@ namespace GFGGame
                             ActivityDataManager.Instance.luckyActTsyBonusState[response.KsBonusState[i]] = response.VsBonusState[i];
                         }
                     }
+                    else if (activityCfg.type == ConstLimitTimeActivityType.ActLimitStlyc)
+                    { 
+
+                    }
                     return true;
                 }
             }

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

@@ -105,7 +105,7 @@ namespace GFGGame
             long endTime = TimeUtil.DateTimeToTimestamp(_activityCfg.endTime);
             long curTime = TimeHelper.ServerNow();
             if (endTime < curTime) return;
-            ViewManager.Show<LuckyBoxActivityView>(_activityId);
+            ViewManager.Show<LuckyBoxActivityView>(new object[] { _activityId, ConstLimitTimeActivityType.ActLimitLuckyBox});
         }
 
         private void OnBtnShopClick()

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxActivityView.cs

@@ -17,6 +17,7 @@ namespace GFGGame
         private ActivityOpenCfg _activityCfg;
         private LuckyBoxCfg _luckyBoxCfg;
         private int _activityId;
+        private int _activityType;
         private Dictionary<string, EffectUI> _effectUIDic = new Dictionary<string, EffectUI>();
 
         public override void Dispose()
@@ -77,7 +78,8 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            _activityId = (int)this.viewData;
+            _activityId = (int)(this.viewData as object[])[0];
+            _activityType = (int)(this.viewData as object[])[1];
             _activityCfg = ActivityOpenCfgArray.Instance.GetCfg(_activityId);
             _luckyBoxCfg = LuckyBoxCfgArray.Instance.GetCfg(_activityCfg.paramsArr[0]);
             _valueBarController.OnShown();
@@ -91,7 +93,7 @@ namespace GFGGame
             UpdateRedDot();
             _ui.m_comBox.m_c1.SetSelectedPage(_activityId.ToString());
 
-            int activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitLuckyBox);
+            int activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(_activityType);
             ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(activityId);
             if(activityOpenCfg.params2Arr.Length > 0)
                 GetWishingPoolInfo(activityId);
@@ -262,7 +264,7 @@ namespace GFGGame
 
         private void OnClickBtnReward()
         {
-            ViewManager.Show<ActivityThemeLuckyBoxBonusView>(ConstLimitTimeActivityType.ActLimitLuckyBox);
+            ViewManager.Show<ActivityThemeLuckyBoxBonusView>(_activityType);
         }
         private void OnClickBtnShop()
         {
@@ -310,7 +312,7 @@ namespace GFGGame
 
         private void UpdateRedDot()
         {
-            RedDotController.Instance.SetComRedDot(_ui.m_btnReward, RedDotDataManager.Instance.GetActLuckyBoxRewardRed(ConstLimitTimeActivityType.ActLimitLuckyBox), "", -18, 11);
+            RedDotController.Instance.SetComRedDot(_ui.m_btnReward, RedDotDataManager.Instance.GetActLuckyBoxRewardRed(_activityType), "", -18, 11);
             RedDotController.Instance.SetComRedDot(_ui.m_btnShop, RedDotDataManager.Instance.GetGiftBagRewardRed(), "", -18, 11);
             RedDotController.Instance.SetComRedDot(_ui.m_btnGiftBag, RedDotDataManager.Instance.GetMeiRiTeHuiRed(), "", -18, 11);
         }
@@ -331,7 +333,7 @@ namespace GFGGame
             {
                 int index = LuckyBoxDataManager.Instance.KsActivityId.IndexOf(activityId);
                 if (index < 0 || !LuckyBoxDataManager.Instance.VsStatus[index])
-                    ViewManager.Show<LuckyBoxWishView>(ConstLimitTimeActivityType.ActLimitLuckyBox);
+                    ViewManager.Show<LuckyBoxWishView>(_activityType);
             }
         }
     }

GameClient/Assets/Game/HotUpdate/Views/OpenServerActivity/OpenServerActivityView.cs

@@ -109,13 +109,13 @@ namespace GFGGame
 
         private void OnClickBtnTenShu()
         {
-            int actLuckyBoxId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitLuckyBox);
-            if (actLuckyBoxId <= 0)
+            int actLimitId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitStlyc);
+            if (actLimitId <= 0)
             {
                 PromptController.Instance.ShowFloatTextPrompt("ťîśŻÎ´żŞĆô");
                 return;
             }
-            ViewManager.Show<ActivityThemeLuckyBoxView>(null, true);
+            ViewManager.Show<LuckyBoxActivityView>(new object[]{actLimitId, ConstLimitTimeActivityType.ActLimitStlyc});
         }
 
         private void OnClickBtnNineZhouPool()