活动弹窗补充提交

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

@@ -6,7 +6,7 @@ using ET;
 
 namespace GFGGame
 {
-    public class ActivityMainTipsView : BaseView
+    public class ActivityMainTipsView : BaseWindow
     {
         private UI_ActivityMainTipsUI _ui;
         private AdCfg[] activitydata;
@@ -41,14 +41,16 @@ namespace GFGGame
                 activitydata = AdCfgArray.Instance.dataArray;
             }
             _ui.m_t4.Play();
+            if (GameGlobal.myNumericComponent.GetAsInt(NumericType.IsPropCzykActivity) == 0)
+            {
+                _ui.m_notTips.url = "ui://ActivityMain/jrbzts_off";
+            }
             UpdateInfo();
         }
         protected async override void OnHide()
         {
             bool result;
             result = await ActivitySProxy.ReqActivityTips(NumericType.IsPropYchmActivity, ActivityDataManager.Instance.todayActivityTips);
-            showActivity.Clear();
-            activitydata = null;
             base.OnHide();
         }
         private void UpdateView()
@@ -73,48 +75,50 @@ namespace GFGGame
             }
             long curTime = TimeHelper.ServerNow();
             _ui.m_activityTime.text = string.Format("剩余{0}", TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime));
-            _ui.m_icon.url = "ui://ActivityMainTips/" + showActivity[0].res;
+            _ui.m_icon.url = ResPathUtil.GetActivityPath(showActivity[0].res);
             // _ui.m_activityDesc.text = showActivity[0].desc;
         }
 
         private void UpdateInfo()
         {
-            showActivity.Clear();
-            for (int i=0; i < activitydata.Length; i++)
+            if (showActivity.Count == 0)
             {
-                AdCfg adCfg = activitydata[i];
-                if (adCfg.activityId > 0)
-                {
-                    if (ActivityGlobalDataManager.Instance.GetActivityInfo(adCfg.activityId) == null) continue;
-                    ActivityInfo activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(adCfg.activityId);
-                    if (TimeHelper.ServerNow() < activityInfo.StartTime || TimeHelper.ServerNow() > activityInfo.EndTime) continue;
-                }
-                if (adCfg.NoticeTips != null || adCfg.NoticeTips != "")
+                for (int i = 0; i < activitydata.Length; i++)
                 {
-                    if(adCfg.activityId != 0)
+                    AdCfg adCfg = activitydata[i];
+                    if (adCfg.activityId > 0)
                     {
+                        if (ActivityGlobalDataManager.Instance.GetActivityInfo(adCfg.activityId) == null) continue;
                         ActivityInfo activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(adCfg.activityId);
-                        if (TimeHelper.ServerNow() < activityInfo.StartTime || TimeHelper.ServerNow() > activityInfo.EndTime)
-                        {
-                            
-                        }
-                        else
-                        {
-                            showActivity.Add(adCfg);
-                            continue;
-                        }
+                        if (TimeHelper.ServerNow() < activityInfo.StartTime || TimeHelper.ServerNow() > activityInfo.EndTime) continue;
                     }
-                    if (adCfg.startTime != "" && adCfg.startTime != null)
+                    if (adCfg.ActivityNotice != null && adCfg.ActivityNotice != "")
                     {
-                        long startTime = TimeUtil.DateTimeToTimestamp(adCfg.startTime);
-                        long endTime = TimeUtil.DateTimeToTimestamp(adCfg.endTime);
-                        if (TimeHelper.ServerNow() < startTime || TimeHelper.ServerNow() > endTime)
+                        if (adCfg.activityId != 0)
                         {
-                            continue;
+                            ActivityInfo activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(adCfg.activityId);
+                            if (TimeHelper.ServerNow() < activityInfo.StartTime || TimeHelper.ServerNow() > activityInfo.EndTime)
+                            {
+
+                            }
+                            else
+                            {
+                                showActivity.Add(adCfg);
+                                continue;
+                            }
                         }
-                        else
+                        if (adCfg.startTime != "" && adCfg.startTime != null)
                         {
-                            showActivity.Add(adCfg);
+                            long startTime = TimeUtil.DateTimeToTimestamp(adCfg.startTime);
+                            long endTime = TimeUtil.DateTimeToTimestamp(adCfg.endTime);
+                            if (TimeHelper.ServerNow() < startTime || TimeHelper.ServerNow() > endTime)
+                            {
+                                continue;
+                            }
+                            else
+                            {
+                                showActivity.Add(adCfg);
+                            }
                         }
                     }
                 }

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

@@ -720,6 +720,8 @@ namespace GFGGame
             for (int i = 0; i < AdCfgArray.Instance.dataArray.Length; i++)
             {
                 AdCfg adCfg = AdCfgArray.Instance.dataArray[i];
+
+                if (adCfg.res == "" || adCfg.res == null) continue;
                 if (adCfg.activityId > 0)
                 {
                     if (ActivityGlobalDataManager.Instance.GetActivityInfo(adCfg.activityId) == null) continue;

GameClient/Assets/Game/HotUpdate/Views/Notice/NoticeView.cs

@@ -118,9 +118,17 @@ namespace GFGGame
             }
             long endTime = 0;
             long curTime = TimeHelper.ServerNow();
-            if (showActivity[0] != null || showActivity != null)
+            if (showActivity.Count > 0)
             {
-                endTime = TimeUtil.DateTimeToTimestamp(showActivity[0].endTime);
+                if (showActivity[index].endTime != "" && showActivity[index].endTime != null)
+                {
+                    endTime = TimeUtil.DateTimeToTimestamp(showActivity[0].endTime);
+                }
+                else
+                {
+                    ActivityInfo activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(showActivity[index].activityId);
+                    endTime = activityInfo.EndTime;
+                }
             }
             item.m_txtTime.text = string.Format("剩余时间：{0}", TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime));
             item.target.onClick.Add(OnListActivityClick);
@@ -209,17 +217,33 @@ namespace GFGGame
                     ActivityInfo activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(adCfg.activityId);
                     if (TimeHelper.ServerNow() < activityInfo.StartTime || TimeHelper.ServerNow() > activityInfo.EndTime) continue;
                 }
-                if (adCfg.startTime != "" && adCfg.startTime != null)
+                if (adCfg.ActivityNotice != null && adCfg.ActivityNotice != "")
                 {
-                    long startTime = TimeUtil.DateTimeToTimestamp(adCfg.startTime);
-                    long endTime = TimeUtil.DateTimeToTimestamp(adCfg.endTime);
-                    if (TimeHelper.ServerNow() < startTime || TimeHelper.ServerNow() > endTime)
+                    if (adCfg.activityId != 0)
                     {
-                        continue;
+                        ActivityInfo activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(adCfg.activityId);
+                        if (TimeHelper.ServerNow() < activityInfo.StartTime || TimeHelper.ServerNow() > activityInfo.EndTime)
+                        {
+
+                        }
+                        else
+                        {
+                            showActivity.Add(adCfg);
+                            continue;
+                        }
                     }
-                    else
+                    if (adCfg.startTime != "" && adCfg.startTime != null)
                     {
-                        showActivity.Add(adCfg);
+                        long startTime = TimeUtil.DateTimeToTimestamp(adCfg.startTime);
+                        long endTime = TimeUtil.DateTimeToTimestamp(adCfg.endTime);
+                        if (TimeHelper.ServerNow() < startTime || TimeHelper.ServerNow() > endTime)
+                        {
+                            continue;
+                        }
+                        else
+                        {
+                            showActivity.Add(adCfg);
+                        }
                     }
                 }
             }