Browse Source

活动弹窗补充提交

zhangyuqian 1 year ago
parent
commit
971cb57eb1

+ 3 - 3
GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/ActivityMainTipsView.cs

@@ -41,9 +41,9 @@ namespace GFGGame
                 activitydata = AdCfgArray.Instance.dataArray;
                 activitydata = AdCfgArray.Instance.dataArray;
             }
             }
             _ui.m_t4.Play();
             _ui.m_t4.Play();
-            if (GameGlobal.myNumericComponent.GetAsInt(NumericType.IsPropCzykActivity) == 0)
+            if (GameGlobal.myNumericComponent.GetAsInt(NumericType.IsPropYchmActivity) == 0)
             {
             {
-                _ui.m_notTips.url = "ui://ActivityMain/jrbzts_off";
+                _ui.m_notTips.url = "ui://ActivityMain/ts_jrbzts";
             }
             }
             UpdateInfo();
             UpdateInfo();
         }
         }
@@ -140,7 +140,7 @@ namespace GFGGame
         }
         }
         private void OnClickTips()
         private void OnClickTips()
         {
         {
-            if(ActivityDataManager.Instance.todayActivityTips == 0)
+            if(GameGlobal.myNumericComponent.GetAsInt(NumericType.IsPropYchmActivity) == 0)
             {
             {
                 _ui.m_notTips.url = "ui://ActivityMain/jrbzts_off";
                 _ui.m_notTips.url = "ui://ActivityMain/jrbzts_off";
                 ActivityDataManager.Instance.todayActivityTips = 1;
                 ActivityDataManager.Instance.todayActivityTips = 1;

+ 5 - 1
GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/MonthlyCardTipsView.cs

@@ -51,6 +51,10 @@ namespace GFGGame
         }
         }
         private void UpdateView()
         private void UpdateView()
         {
         {
+            if (GameGlobal.myNumericComponent.GetAsInt(NumericType.IsPropCzykActivity) == 0)
+            {
+                _ui.m_notTips.url = "ui://ActivityMain/ts_jrbzts";
+            }
             _ui.m_rewardList.numItems = rewards;
             _ui.m_rewardList.numItems = rewards;
         }
         }
         private void ListItemRender(int index, GObject obj)
         private void ListItemRender(int index, GObject obj)
@@ -81,7 +85,7 @@ namespace GFGGame
 
 
         private void OnClickTips()
         private void OnClickTips()
         {
         {
-            if (ActivityDataManager.Instance.todayMonthlyCardTips == 0)
+            if (GameGlobal.myNumericComponent.GetAsInt(NumericType.IsPropCzykActivity) == 0)
             {
             {
                 _ui.m_notTips.url = "ui://ActivityMain/jrbzts_off";
                 _ui.m_notTips.url = "ui://ActivityMain/jrbzts_off";
                 ActivityDataManager.Instance.todayMonthlyCardTips = 1;
                 ActivityDataManager.Instance.todayMonthlyCardTips = 1;