Merge remote-tracking branch 'remotes/origin/master' into xiaojie

FGUIProject/assets/DailyWelfare/components/ListChargeItem.xml

@@ -8,7 +8,7 @@
   <displayList>
     <image id="n2_mbf1" name="n2" src="uxxstmj" fileName="imagesNew/mrrw_db.png" pkg="eg2y0ldp" xy="0,0"/>
     <image id="n9_idkd" name="n9" src="uxxstmq" fileName="imagesNew/mrrw_bq_qb.png" pkg="eg2y0ldp" xy="37,5"/>
-    <list id="n3_mbf1" name="listRewards" xy="93,65" size="662,131" layout="row" overflow="scroll" scroll="horizontal" colGap="6" defaultItem="ui://eg2y0ldp9jv6tls">
+    <list id="n3_mbf1" name="listRewards" xy="90,65" size="670,131" layout="row" overflow="scroll" scroll="horizontal" colGap="6" defaultItem="ui://eg2y0ldp9jv6tls">
       <item/>
       <item/>
       <item/>

FGUIProject/assets/Store/components/ComVipLv.xml

@@ -16,6 +16,5 @@
     <component id="n44_hhx9" name="btnRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="862,63" size="52,52">
       <Button icon="ui://p9mtgheofqortar"/>
     </component>
-    <text id="n45_l500" name="txtTipsFull" xy="505,87" size="100,44" fontSize="32" color="#8c8580" ubb="true" vars="true" text="已满级"/>
   </displayList>
 </component>

FGUIProject/assets/Store/components/ProgressBar1.xml

@@ -7,7 +7,7 @@
     </image>
     <image id="n1_hhx9" name="bar" src="hhx9f" fileName="imagesNew/VipLevel_Progress_fill.png" xy="4,3" size="656,18" fillMethod="hz"/>
     <image id="n2_hhx9" name="n2" src="hhx9d" fileName="imagesNew/VipLevel_Progress_frame2.png" xy="0,0" fillMethod="hz"/>
-    <text id="n4_hhx9" name="txttitle" xy="576,21" pivot="1,0" size="71,39" fontSize="28" color="#8c8580" align="right" ubb="true" vars="true" text="[color=#5A3E16]{value=0}[/color]/{max=100}"/>
+    <text id="n4_hhx9" name="txttitle" xy="551,21" pivot="1,0" size="96,39" fontSize="28" color="#8c8580" align="right" ubb="true" vars="true" text="[color=#5A3E16]{value=0}[/color]/{max=MAX}"/>
   </displayList>
   <ProgressBar titleType="valueAndmax"/>
 </component>

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

@@ -354,5 +354,24 @@ namespace GFGGame
             LeagueHotelCfg hotelCfg = LeagueHotelCfgArray.Instance.GetCfg(LeagueDataManager.Instance.HotelLevel);
             return LeagueDataManager.Instance.ListApplyDatas.Count > 0 && LeagueDataManager.Instance.LeagueData.Num < hotelCfg.limit;
         }
+
+        /// <summary>
+        /// 限时累充可领奖励红点
+        /// </summary>
+        /// <returns></returns>
+        public bool GetLimiteChargeRewardRed()
+        {
+            if (ActivityDataManager.Instance.actLimitChargeId == 0) return false;
+            ActivityInfo _activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(ActivityDataManager.Instance.actLimitChargeId);
+            List<ActivityRechargeCfg> _rechargeCfgs = ActivityRechargeCfgArray.Instance.GetCfgsByactivityId(ActivityDataManager.Instance.actLimitChargeId);
+            for (int i = 0; i < _rechargeCfgs.Count; i++)
+            {
+                if (_activityInfo.CountValue >= _rechargeCfgs[i].value && _activityInfo.GetRewards.IndexOf(_rechargeCfgs[i].id) < 0)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
     }
 }

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

@@ -30,8 +30,7 @@ namespace GFGGame
             VipCfg vipCfg = VipCfgArray.Instance.GetCfg(RoleDataManager.vipLv);
             if (vipCfg == null) return;
             VipCfg nextVipCfg = VipCfgArray.Instance.GetCfg(RoleDataManager.vipLv + 1);
-            com.m_txtTipsFull.visible = RoleDataManager.vipExp >= vipCfg.num && nextVipCfg == null;
-            com.m_grpTips.visible = nextVipCfg != null || RoleDataManager.vipExp < vipCfg.num;
+            com.m_grpTips.visible = nextVipCfg != null;
             if (com.m_btnRule.data == null)
             {
                 com.m_btnRule.onClick.Add(RuleController.ShowRuleView);
@@ -46,6 +45,13 @@ namespace GFGGame
                 com.m_txtTips.SetVar("exp", (vipCfg.num - RoleDataManager.vipExp).ToString()).FlushVars();
                 com.m_txtTips.SetVar("vipLv", (nextVipCfg.id).ToString()).FlushVars();
             }
+            else
+            {
+                com.m_proExp.target.max = vipCfg.num;
+                com.m_proExp.target.value = RoleDataManager.vipExp;
+                com.m_proExp.m_txttitle.SetVar("value", com.m_proExp.target.value.ToString()).FlushVars();
+                com.m_proExp.m_txttitle.SetVar("max", "MAX").FlushVars();
+            }
             UI_ComVipLv.ProxyEnd();
         }
 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ComVipLv.cs

@@ -13,7 +13,6 @@ namespace UI.Store
         public GTextField m_txtTips;
         public GGroup m_grpTips;
         public GButton m_btnRule;
-        public GTextField m_txtTipsFull;
         public const string URL = "ui://p9mtgheohhx91r";
         public const string PACKAGE_NAME = "Store";
         public const string RES_NAME = "ComVipLv";
@@ -67,7 +66,6 @@ namespace UI.Store
             m_txtTips = (GTextField)comp.GetChild("txtTips");
             m_grpTips = (GGroup)comp.GetChild("grpTips");
             m_btnRule = (GButton)comp.GetChild("btnRule");
-            m_txtTipsFull = (GTextField)comp.GetChild("txtTipsFull");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -78,7 +76,6 @@ namespace UI.Store
             m_txtTips = null;
             m_grpTips = null;
             m_btnRule = null;
-            m_txtTipsFull = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/ServerProxy/ActivityGlobalSProxy.cs

@@ -85,11 +85,12 @@ namespace GFGGame
         {
             var response =
                 (S2C_GetActivityBonus)await MessageHelper.SendToServer(new C2S_GetActivityBonus()
-                    { ActivityId = activityId, BonusId = bonusId });
+                { ActivityId = activityId, BonusId = bonusId });
             if (!(response is { Error: ErrorCode.ERR_Success })) return false;
             //奖励弹窗
             BonusController.TryShowBonusList(ItemUtil.CreateItemDataList(response.itemList));
             ActivityGlobalDataManager.Instance.AddActivityRewardInfo(activityId, bonusId);
+            EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
             return false;
         }
     }

GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/DailyWelfareView.cs

@@ -54,7 +54,7 @@ namespace GFGGame
         protected override void AddEventListener()
         {
             base.AddEventListener();
-            // EventAgent.AddEventListener(ConstMessage.NUMERIC_CHANGE, UpdateView);
+            EventAgent.AddEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
         }
 
         protected override void OnShown()
@@ -79,6 +79,7 @@ namespace GFGGame
             {
                 Timers.inst.Add(1, 0, UpdateTime);
             }
+            UpdateRedDot();
         }
 
         protected override void OnHide()
@@ -90,6 +91,7 @@ namespace GFGGame
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
         }
         private void UpdateTime(object param)
         {
@@ -124,5 +126,9 @@ namespace GFGGame
         {
             ViewManager.Show<DailySupplyView>();
         }
+        private void UpdateRedDot()
+        {
+            RedDotController.Instance.SetComRedDot(_ui.m_comList.m_btnLimitChargeAddUp.target, RedDotDataManager.Instance.GetLimiteChargeRewardRed(), "", -40);
+        }
     }
 }

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

@@ -1012,7 +1012,8 @@ namespace GFGGame
             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_btnTravel.target, RedDotDataManager.Instance.GetTravelRed(), "", -38);
-            RedDotController.Instance.SetComRedDot(_btnLeague, RedDotDataManager.Instance.GetLeagueMemberJoinRed());
+            RedDotController.Instance.SetComRedDot(_btnLeague, RedDotDataManager.Instance.GetLeagueMemberJoinRed() || LeagueDataManager.Instance.Type == LeagueJoinType.UnJoin);
+            RedDotController.Instance.SetComRedDot(_ui.m_btnDailyWelfare.target, RedDotDataManager.Instance.GetLimiteChargeRewardRed(), "", -10, 5);
 
         }