Browse Source

每天免费的祈福需要红点

zhaoyang 2 years ago
parent
commit
fece87563d

+ 1 - 1
FGUIProject/assets/League/components/Button20.xml

@@ -12,7 +12,7 @@
       <relation target="" sidePair="middle-middle,left-right"/>
       <relation target="" sidePair="middle-middle,left-right"/>
     </text>
     </text>
     <text id="n5_a0cf" name="txtTip" xy="89,59" pivot="0.5,0" size="10,35" font="ui://eg2y0ldpa0cftks" fontSize="25" color="#716660" text=""/>
     <text id="n5_a0cf" name="txtTip" xy="89,59" pivot="0.5,0" size="10,35" font="ui://eg2y0ldpa0cftks" fontSize="25" color="#716660" text=""/>
-    <component id="n6_a0cf" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="27,53" pivot="0.5,0.5" scale="0.8,0.8" controller="c1,1">
+    <component id="n6_a0cf" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="35,53" pivot="0.5,0.5" scale="0.8,0.8" controller="c1,1">
       <relation target="" sidePair="center-center"/>
       <relation target="" sidePair="center-center"/>
     </component>
     </component>
   </displayList>
   </displayList>

+ 21 - 3
GameClient/Assets/Game/HotUpdate/Data/RedDotDataManager.cs

@@ -395,7 +395,11 @@ namespace GFGGame
             }
             }
             return false;
             return false;
         }
         }
-
+        /// <summary>
+        /// 服装合成红点
+        /// </summary>
+        /// <param name="suitId"></param>
+        /// <returns></returns>
         public bool GetClothingSyntheticRed(int suitId)
         public bool GetClothingSyntheticRed(int suitId)
         {
         {
             SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(suitId);
             SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(suitId);
@@ -483,7 +487,14 @@ namespace GFGGame
 
 
             return RoleDataManager.CheckIsMonthCardOpenByType(MonthCardType.BlackGold) && !MathHelper.isBitSet(GameGlobal.myNumericComponent.GetAsInt(NumericType.MonthCardExclusiveClothesMouth), _month);
             return RoleDataManager.CheckIsMonthCardOpenByType(MonthCardType.BlackGold) && !MathHelper.isBitSet(GameGlobal.myNumericComponent.GetAsInt(NumericType.MonthCardExclusiveClothesMouth), _month);
         }
         }
-
+        /// <summary>
+        /// 联盟
+        /// </summary>
+        /// <returns></returns>
+        public bool GetLeagueRed()
+        {
+            return GetLeagueMemberJoinRed() || LeagueDataManager.Instance.Type == LeagueJoinType.UnJoin || GetLeagueGiftBoxRed() || GetLeaguePrayRed();
+        }
         /// <summary>
         /// <summary>
         /// 联盟-成员申请
         /// 联盟-成员申请
         /// </summary>
         /// </summary>
@@ -508,7 +519,14 @@ namespace GFGGame
             }
             }
             return false;
             return false;
         }
         }
-
+        /// <summary>
+        /// 联盟-雅集祈福
+        /// </summary>
+        /// <returns></returns>
+        public bool GetLeaguePrayRed()
+        {
+            return LeagueDataManager.Instance.GetPrayTimesByType(LeaguePrayType.First) == 0;
+        }
         /// <summary>
         /// <summary>
         /// 限时抽奖活动奖励
         /// 限时抽奖活动奖励
         /// </summary>
         /// </summary>

+ 1 - 0
GameClient/Assets/Game/HotUpdate/ServerProxy/LeagueSproxy.cs

@@ -569,6 +569,7 @@ namespace GFGGame
                 if (response.Error == ErrorCode.ERR_Success)
                 if (response.Error == ErrorCode.ERR_Success)
                 {
                 {
                     PromptController.Instance.ShowFloatTextPrompt("祈福完成");
                     PromptController.Instance.ShowFloatTextPrompt("祈福完成");
+                    EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
                     return true;
                     return true;
                 }
                 }
             }
             }

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/League/LeaguePrayView.cs

@@ -89,6 +89,7 @@ namespace GFGGame
             }
             }
             item.m_btnPray.target.data = type;
             item.m_btnPray.target.data = type;
 
 
+            RedDotController.Instance.SetComRedDot(item.m_btnPray.target, type == LeaguePrayType.First && RedDotDataManager.Instance.GetLeaguePrayRed());
             UI_ComPary.ProxyEnd();
             UI_ComPary.ProxyEnd();
         }
         }
 
 

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/League/LeagueView.cs

@@ -177,6 +177,7 @@ namespace GFGGame
         {
         {
             RedDotController.Instance.SetComRedDot(_ui.m_btnMember.target, RedDotDataManager.Instance.GetLeagueMemberJoinRed());
             RedDotController.Instance.SetComRedDot(_ui.m_btnMember.target, RedDotDataManager.Instance.GetLeagueMemberJoinRed());
             RedDotController.Instance.SetComRedDot(_ui.m_btnGift.target, RedDotDataManager.Instance.GetLeagueGiftBoxRed(), "", -120, 100);
             RedDotController.Instance.SetComRedDot(_ui.m_btnGift.target, RedDotDataManager.Instance.GetLeagueGiftBoxRed(), "", -120, 100);
+            RedDotController.Instance.SetComRedDot(_ui.m_btnPray.target, RedDotDataManager.Instance.GetLeaguePrayRed(), "", -70, 60);
         }
         }
     }
     }
 }
 }

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -1018,7 +1018,7 @@ namespace GFGGame
             RedDotController.Instance.SetComRedDot(_ui.m_btnStudio.target, RedDotDataManager.Instance.GetStudioFilingRed(), "", -38);
             RedDotController.Instance.SetComRedDot(_ui.m_btnStudio.target, RedDotDataManager.Instance.GetStudioFilingRed(), "", -38);
             RedDotController.Instance.SetComRedDot(_ui.m_headBar.target, RedDotDataManager.Instance.GetHeadRed() || RedDotDataManager.Instance.GetHeadBorderRed(), "", 5, 7);
             RedDotController.Instance.SetComRedDot(_ui.m_headBar.target, RedDotDataManager.Instance.GetHeadRed() || RedDotDataManager.Instance.GetHeadBorderRed(), "", 5, 7);
             RedDotController.Instance.SetComRedDot(_ui.m_btnTravel.target, RedDotDataManager.Instance.GetTravelRed(), "", -38);
             RedDotController.Instance.SetComRedDot(_ui.m_btnTravel.target, RedDotDataManager.Instance.GetTravelRed(), "", -38);
-            RedDotController.Instance.SetComRedDot(_btnLeague, RedDotDataManager.Instance.GetLeagueMemberJoinRed() || LeagueDataManager.Instance.Type == LeagueJoinType.UnJoin || RedDotDataManager.Instance.GetLeagueGiftBoxRed());
+            RedDotController.Instance.SetComRedDot(_btnLeague, RedDotDataManager.Instance.GetLeagueRed());
             RedDotController.Instance.SetComRedDot(_ui.m_btnDailyWelfare.target, RedDotDataManager.Instance.GetDailyWelfareRed(), "", -10, 5);
             RedDotController.Instance.SetComRedDot(_ui.m_btnDailyWelfare.target, RedDotDataManager.Instance.GetDailyWelfareRed(), "", -10, 5);
             RedDotController.Instance.SetComRedDot(_ui.m_btnActivityLuckyBox.target, RedDotDataManager.Instance.GetMeiRiTeHuiRed() || RedDotDataManager.Instance.GetActLuckyBoxRewardRed() || RedDotDataManager.Instance.GetActLuckyBoxTaskdRed() || RedDotDataManager.Instance.GetGiftBagRewardRed(), "", -10, 5);
             RedDotController.Instance.SetComRedDot(_ui.m_btnActivityLuckyBox.target, RedDotDataManager.Instance.GetMeiRiTeHuiRed() || RedDotDataManager.Instance.GetActLuckyBoxRewardRed() || RedDotDataManager.Instance.GetActLuckyBoxTaskdRed() || RedDotDataManager.Instance.GetGiftBagRewardRed(), "", -10, 5);
             RedDotController.Instance.SetComRedDot(_btnBag, RedDotDataManager.Instance.GetMainBagGiftRed());
             RedDotController.Instance.SetComRedDot(_btnBag, RedDotDataManager.Instance.GetMainBagGiftRed());

BIN
GameClient/Assets/ResIn/UI/League/League_fui.bytes