修改万世礼活动的部分逻辑

修改周中活动的背景读取

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

@@ -95,6 +95,21 @@ namespace GFGGame
             return activityInfoIds.Select(GetActivityInfo).Where(activityInfo => activityInfo != null).ToList();
         }
 
+        public List<ActivityInfo> GetActivityInfoByTypeAndID(int activityType, int outActivityID)
+        {
+            List<ActivityOpenCfg> list = ActivityOpenCfgArray.Instance.GetCfgsBytype(activityType);
+            List<int> infoList = new List<int>();
+            for(int i = 0; i < list.Count; i++)
+            {
+                if(list[i].params2Arr!=null && list[i].params2Arr.Length > 0 
+                    && list[i].params2Arr[0] == outActivityID)
+                {
+                    infoList.Add(list[i].id);
+                }
+            }
+            return infoList.Select(GetActivityInfo).Where(activityInfo => activityInfo != null).ToList();
+        }
+
         //获取活动数据根据类型
         public ActivityInfo GetActivityInfoOneByType(int activityType)
         {

GameClient/Assets/Game/HotUpdate/Utils/ResPathUtil.cs

@@ -20,6 +20,7 @@ namespace GFGGame
         public static readonly string Material_DIR_PATH = $"{RES_ROOT_DIR_PATH}/Material";
         public static readonly string Shader_DIR_PATH = $"{RES_ROOT_DIR_PATH}/Shader";
         public static readonly string Model_DIR_PATH = $"{RES_ROOT_DIR_PATH}/model";
+        public static readonly string STUDIO_FILING_DIR_PATH = $"{RES_ROOT_DIR_PATH}/Texture/Studios/CYJD/";
 
         public static readonly string SQLITE_FILE_PATH = CONFIG_DIR_PATH + "/" + LauncherConfig.SQL_FILE_NAME;
 
@@ -192,5 +193,10 @@ namespace GFGGame
         {
             return $"{TEXTURE_DIR_PATH}/LeagueIcon/{res}.{extName}";
         }
+
+        public static string GetStudioFilingPicPath(string res, string extName = "png")
+        {
+            return $"{STUDIO_FILING_DIR_PATH}{"dangan_"}{res}.{extName}";
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/ActivityAfuGift/ActivityAfuGiftView.cs

@@ -140,7 +140,6 @@ namespace GFGGame
                 long endTime = activityInfo.EndTime;
                 _ui.m_txtTime.text = TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime);
             }
-
         }
 
         private void RenderListReward(int index, GObject item)
@@ -291,7 +290,7 @@ namespace GFGGame
         {
             if (!ActivityAfuGiftDataManager.Instance.IsOpen)
             {
-                Hide();
+                //Hide();
                 return;
             }
 

GameClient/Assets/Game/HotUpdate/Views/ActivityWanShiLiUI/ActivityWanShiLiView.cs

@@ -36,7 +36,8 @@ namespace GFGGame
             this.modal = true;
             viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
-            _rechargeCfgs = ActivityRecharge2CfgArray.Instance.dataArray;
+            _activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(ActivityType.WanShiLi);
+            _rechargeCfgs = ActivityRecharge2CfgArray.Instance.GetCfgsByactivityId(_activityInfo.ActivityId).ToArray();
             InitProgressValueList();
             InitReward();
 
@@ -80,6 +81,11 @@ namespace GFGGame
         /// </summary>
         private void InitProgressValueList()
         {
+            if(_rechargeCfgs.Length == 0)
+            {
+                return;
+            }
+
             _progressValuePart = new int[_partNum];
             _ui.m_progress.target.max = _rechargeCfgs[_rechargeCfgs.Length - 1].value;
             int max = (int)_ui.m_progress.target.max;
@@ -98,6 +104,11 @@ namespace GFGGame
         /// </summary>
         private void InitReward()
         {
+            if (_rechargeCfgs.Length == 0)
+            {
+                return;
+            }
+
             for (int i = 0; i < _partNum; i++)
             {
                 GObject gift = _ui.target.GetChild("DBGiftItem" + i);
@@ -158,8 +169,12 @@ namespace GFGGame
         private void UpdateTime(object param)
         {
             long curTime = TimeHelper.ServerNow();
-            long endTime = _activityInfo.EndTime;
-            _ui.m_txtTime.text = TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime);
+            var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(ActivityType.WanShiLi);
+            if (activityInfo != null)
+            {
+                long endTime = activityInfo.EndTime;
+                _ui.m_txtTime.text = TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime);
+            }
         }
 
         private void UpdateView()
@@ -180,6 +195,11 @@ namespace GFGGame
         /// <param name="index">玩家可领取的最大奖励index</param>
         private void UpdateRewardState(int index)
         {
+            if (_rechargeCfgs.Length == 0)
+            {
+                return;
+            }
+
             for (int i = 0; i < _partNum; i++)
             {
                 GObject gift = _ui.target.GetChild("DBGiftItem" + i);

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

@@ -111,7 +111,7 @@ namespace GFGGame
             UI_ComBox comBox = UI_ComBox.Proxy(_ui.m_comBox.target);
 
             LuckyBoxDataManager.Instance.InitData(_luckyBoxCfg.id);
-            // comBox.m_comModel.m_loaBg.url = ResPathUtil.GetBgImgPath(_luckyBoxCfg.resArr[0]);
+            //comBox.m_comModel.m_loaBg.url = ResPathUtil.GetBgImgPath(_luckyBoxCfg.resArr[0]);
             comBox.m_btnPreview.m_c1.selectedIndex = 1;
 
 
@@ -157,8 +157,8 @@ namespace GFGGame
         }
         private void UpGiftBox()
         {
-            var activityInfoByTypeList = ActivityGlobalDataManager.Instance.GetActivityInfoByType(ActivityType.XSLB3);
-
+            var activityInfoByTypeList = ActivityGlobalDataManager.Instance.GetActivityInfoByTypeAndID(ActivityType.XSLB3, _activityId);
+            
             var list = activityInfoByTypeList.Where(a => a.EndTime > TimeInfo.Instance.ServerNow()).ToList();
             if (list.Count == 0)
             {

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioFilingNpcView.cs

@@ -76,7 +76,7 @@ namespace GFGGame
             UI_ListNpcItem item = UI_ListNpcItem.Proxy(obj);
             bool isPass = InstanceZonesDataManager.CheckLevelPass(cfg.storyLevelId);
             item.m_ComIcon.m_loaIcon.url = ResPathUtil.GetNpcPicSPath(cfg.res);// isPass ? ResPathUtil.GetNpcPicSPath(cfg.res) : ResPathUtil.GetNpcPicSPath(cfg.inRes);
-            item.m_ComIcon.m_loaIcon.url = $"Assets/Res/Texture/Studios/CYJD/{"dangan_"}{cfg.res}.{"png"}";
+            item.m_ComIcon.m_loaIcon.url = ResPathUtil.GetStudioFilingPicPath(cfg.res);
             item.m_imgLock.visible = !isPass;
             item.m_txtName.text = cfg.name;
             item.m_grpName.visible = isPass;

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioFilingView.cs

@@ -113,7 +113,7 @@ namespace GFGGame
             RoleLimitData limitData = RoleLimitDataManager.GetLimitData(this._studioCfg.limit);
             var limitCfg = LimitCfgArray.Instance.GetCfg(this._studioCfg.limit);
             _ui.m_btnAdd.visible = limitCfg.itemID > 0;
-            _ui.m_loaBg.url = $"Assets/Res/Texture/Studios/CYJD/{_studioCfg.res}.{"png"}";//ResPathUtil.GetBgImgPath(_studioCfg.res);
+            _ui.m_loaBg.url = ResPathUtil.GetStudioFilingPicPath(_studioCfg.res); //ResPathUtil.GetBgImgPath(_studioCfg.res);
             _ui.m_btnChange.title = _studioCfg.name;
             _ui.m_txtNum.text = string.Format("剩余次数：{0}/{1}", limitData.TotalPlayMax - limitData.PlayTimes, limitData.MaxStorageCount);