锟斤拷锟矫伙拷锟结交

GameClient/Assets/AssetBundleCollectorSetting.asset

@@ -137,7 +137,7 @@ MonoBehaviour:
         UserData: 
     - GroupName: res
       GroupDesc: 
-      AssetTags: preload
+      AssetTags: dynamic
       ActiveRuleName: EnableGroup
       Collectors:
       - CollectPath: Assets/Res

GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/BlindBoxRewardView.cs

@@ -36,7 +36,7 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            BlindBoxCfg blindBoxCfg = BlindBoxCfgArray.Instance.GetCfg(1);
+            BlindBoxCfg blindBoxCfg = BlindBoxCfgArray.Instance.GetCfg(2);
             int id1 = blindBoxCfg.OrdinaryDropDisplay; //(int)(this.viewData as object[])[0];
             int id2 = blindBoxCfg.HideDropDisplay; //(int)(this.viewData as object[])[1];
             _rewardNormal = DropOutCfgArray.Instance.GetCfgsByid(id1);

GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/BlindBoxView.cs

@@ -22,7 +22,7 @@ namespace GFGGame
         private Dictionary<string, EffectUI> _effectUIDic = new Dictionary<string, EffectUI>();
         private ItemCfg itemcfg;
         private int listIndex = 0;
-        BlindBoxCfg blindBoxCfg = BlindBoxCfgArray.Instance.GetCfg(1);
+        BlindBoxCfg blindBoxCfg = BlindBoxCfgArray.Instance.GetCfg(2);
         public override void Dispose()
         {
             EffectUIPool.Recycle(_effectUI1);
@@ -261,7 +261,7 @@ namespace GFGGame
         private void UpdateTime(object param)
         {
             long curTime = TimeHelper.ServerNow();
-            var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(10301);
+            var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(10302);
             if (activityInfo != null)
             {
                 long endTime = activityInfo.EndTime;

GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -366,7 +366,7 @@ namespace GFGGame
         //限定盲盒按钮显示
         private void RefreshBtnXdmhActivity()
         {
-            _ui.m_btnActivityXDMH.target.visible = ActivityGlobalDataManager.Instance.IsActivityOpen(10301);
+            _ui.m_btnActivityXDMH.target.visible = ActivityGlobalDataManager.Instance.IsActivityOpen(10302);
         }
 
         private void RefreshBtnActivityFYJY()