Merge branch 'master' of http://10.108.64.190:3000/gfg/client

FGUIProject/assets/League/LeagueMemberAppointUI.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,647">
-  <controller name="c1" pages="0,,1," selected="0">
+  <controller name="c1" pages="0,,1," selected="1">
     <remark page="0" value="副会长"/>
     <remark page="1" value="会长"/>
   </controller>
@@ -27,12 +27,12 @@
       <Button controller="c2" page="2"/>
       <property target="txtName" propertyId="0" value="副社长"/>
     </component>
-    <component id="n2_rv09" name="btnAppoint2" src="rv091s" fileName="components/Button15.xml" xy="230,211" group="n3_rv09">
+    <component id="n2_rv09" name="btnAppoint2" src="rv091s" fileName="components/Button15.xml" xy="230,357" group="n3_rv09">
       <gearDisplay controller="c1" pages="0,1"/>
       <Button controller="c2" page="3"/>
-      <property target="txtName" propertyId="0" value="御史"/>
+      <property target="txtName" propertyId="0" value="社花"/>
     </component>
-    <group id="n3_rv09" name="n3" xy="230,211" size="620,53" advanced="true" layout="vt" lineGap="20" excludeInvisibles="true"/>
+    <group id="n3_rv09" name="n3" xy="230,211" size="620,199" advanced="true" layout="vt" lineGap="20" excludeInvisibles="true"/>
     <component id="n5_rv09" name="btnKick" src="rv091g" fileName="components/BtnBig.xml" pkg="mk0fwx0x" xy="410,520">
       <Button title="请离雅集"/>
     </component>

GameClient/Assets/Game/HotUpdate/Constant/ConstStoreSubId.cs

@@ -4,7 +4,7 @@ namespace GFGGame
     {
         public const int STORE_CHARGE = 0;//充值
         public const int STORE_CHARGE_ADDUP = 1;//累计充值
-        public const int STORE_MONTH_GLOAD_CARD = 0;//金卡
+        public const int STORE_MONTH_GOLD_CARD = 0;//金卡
         public const int STORE_MONTH_BLACK_CARD = 1;//黑金卡
         public const int STORE_GIFT_BAG_ACTIVITY = 0;//活动
         public const int STORE_GIFT_BAG_TIME_LIMIT = 1;//限时活动

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

@@ -111,7 +111,7 @@ namespace GFGGame
         /// <value></value>
         public bool IsSeasonOpen
         {
-            get 
+            get
             {
                 ArenaOpenCfg cfg = ArenaOpenCfgArray.Instance.GetCfg(SeasonId);
                 if (TimeUtil.IsBeforeCurTime(cfg.openTime) && TimeUtil.IsLaterCurTime(cfg.endTime))
@@ -421,11 +421,19 @@ namespace GFGGame
             }
             RemoveCheckSeasonOpenTimer();
         }
-        public void ReqArenaInfo()
+        public async void ReqArenaInfo()
         {
             if (FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(ArenaView).Name, false))
             {
-                ArenaSproxy.ReqArenaInfos().Coroutine();
+                await ArenaSproxy.ReqArenaInfos();
+                for (int i = 0; i < ArenaDataManager.Instance.Targets.Count; i++)
+                {
+                    ArenaTargetData targetData = ArenaDataManager.Instance.Targets[i];
+                    if (targetData.Type == FightTargetType.PLAYER)
+                    {
+                        ArenaSproxy.ReqArenaFightAttr(targetData.RoleInfo.roleId, targetData.FightDatas).Coroutine();
+                    }
+                }
                 ArenaSproxy.ReqArenaHistory().Coroutine();
             }
         }

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

@@ -344,8 +344,16 @@ namespace GFGGame
             return itemHas >= itemNeed && costHas >= costNeed;
         }
 
+        /// <summary>
+        /// 商城
+        /// </summary>
+        /// <returns></returns>
+        public bool GetShopRed()
+        {
+            return GetChargeAddUpRewardRed() || GetGiftBagRewardRed() || GetGoldCardRewardRed() || GetBlackCardRewardRed();
+        }
         //商店-充值-会员中心
-        public bool GetChargeAddUpReward()
+        public bool GetChargeAddUpRewardRed()
         {
             VipCfg[] vipCfgs = VipCfgArray.Instance.dataArray;
 
@@ -360,7 +368,7 @@ namespace GFGGame
                    RoleDataManager.vipLv > 0;
         }
         //商店-礼包-活动礼包
-        public bool GetGiftBagReward()
+        public bool GetGiftBagRewardRed()
         {
             List<ShopCfg> shopCfgs = ShopCfgArray.Instance.GetCfgsBymenu1Andmenu2(ConstStoreTabId.STORE_GIFT_BAG, ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY);
             shopCfgs = ShopDataManager.Instance.RemoveNotOpenCfg(shopCfgs);
@@ -371,6 +379,22 @@ namespace GFGGame
             return false;
         }
         /// <summary>
+        /// 商城-月卡-金卡
+        /// </summary>
+        /// <returns></returns>
+        public bool GetGoldCardRewardRed()
+        {
+            return RoleDataManager.CheckIsMonthCardOpenByType(MonthCardType.Gold) && GameGlobal.myNumericComponent.GetAsInt(NumericType.MonthCardGoldReward) <= 0;
+        }
+        /// <summary>
+        /// 商城-月卡-黑金卡
+        /// </summary>
+        /// <returns></returns>
+        public bool GetBlackCardRewardRed()
+        {
+            return RoleDataManager.CheckIsMonthCardOpenByType(MonthCardType.BlackGold) && GameGlobal.myNumericComponent.GetAsInt(NumericType.MonthCardBlackGoldReward) <= 0;
+        }
+        /// <summary>
         /// 联盟-成员申请
         /// </summary>
         /// <returns></returns>
@@ -424,7 +448,7 @@ namespace GFGGame
         {
             return !LimitedTimeGiftBoxDataManager.Instance.IsOpenMeiRiTeHui;
         }
-        
+
         /// <summary>
         /// 背包中存在礼包就一直给主界面 背包 红点
         /// </summary>
@@ -452,5 +476,6 @@ namespace GFGGame
         //
         //     return false;
         // }
+
     }
 }

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

@@ -209,11 +209,13 @@ namespace GFGGame
                     }
                     else
                     {
+                        if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(nameof(LeagueView))) return;
                         ViewManager.Show<LeagueJoinView>(null, goBackDatas, true, true);
                     }
 
                     break;
                 case nameof(LeagueView):
+                    if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(nameof(LeagueView))) return;
                     if (LeagueDataManager.Instance.Type == LeagueJoinType.Join)
                     {
                         ViewManager.Show<LeagueView>(null, goBackDatas, true);

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

@@ -433,7 +433,11 @@ namespace GFGGame
             fightData.res = string.IsNullOrEmpty(robotProto.RobotHead) ? "self" : robotProto.RobotHead;
             double cardScore = (double)robotCfg.cardScore * randoms;
             fightData.cardScore = (int)Math.Ceiling(cardScore);
-            fightData.skillLvs.Add(robotCfg.skillLvs);
+            List<PassivitySkillCfg> skillCfgs = PassivitySkillCfgArray.Instance.GetCfgsBycardId(fightData.cardId);
+            for (int i = 0; i < skillCfgs.Count; i++)
+            {
+                fightData.skillLvs.Add(robotCfg.skillLvs);
+            }
             fightData.showSuitId = robotProto.SuitList.Count <= index ? 0 : robotProto.SuitList[index];//上赛季没有穿戴数据
 
             return fightData;

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

@@ -69,7 +69,7 @@ namespace GFGGame
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
-                    int[][] bonus = VipCfgArray.Instance.GetCfg(vipLv-1).bonusOnceArr;
+                    int[][] bonus = VipCfgArray.Instance.GetCfg(vipLv - 1).bonusOnceArr;
                     BonusController.TryShowBonusList(bonus);
                     return true;
                 }
@@ -104,6 +104,7 @@ namespace GFGGame
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
+                    EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
                     return true;
                 }
             }

GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaRankView.cs

@@ -300,8 +300,9 @@ namespace GFGGame
                 RoleInfoManager.Instance.UpdateLv(item.m_comLv, arenaData.RoleInfo.roleLv);
                 if (arenaData.Type == FightTargetType.PLAYER)
                 {
+                    long fightScore = _rankType != ArenaRankType.LAST_SEASON && rank > 100 && isSelf ? ArenaDataManager.Instance.GetAllFightScore(ArenaDataManager.Instance.DressupList) : ArenaDataManager.Instance.GetAllFightScore(arenaData.FightScores);
                     //上榜的玩家一定战斗过，可以直接计算
-                    item.m_txtFightScore.text = string.Format("飞花令战力：{0}", ArenaDataManager.Instance.GetAllFightScore(arenaData.FightScores));
+                    item.m_txtFightScore.text = string.Format("飞花令战力：{0}", fightScore);
                     RoleInfoManager.Instance.UpdateHead(item.m_comHead, arenaData.RoleInfo.headId, arenaData.RoleInfo.headBorderId);
                 }
                 else

GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs

@@ -768,7 +768,7 @@ namespace GFGGame
             PassivitySkillLvlCfg skillLvlCfg = PassivitySkillLvlCfgArray.Instance.GetCfgByskilllvlAndskillId(skillLv, skillCfg.skillId);
             // item.m_txtDesc.text = skillLvlCfg.describe;
             // item.m_btnUp.visible = PassivitySkillLvlCfgArray.Instance.GetCfgByskilllvlAndskillId(skillLv + 1, skillCfg.skillId) != null;
-            RedDotController.Instance.SetComRedDot(item.target, RedDotDataManager.Instance.GetCardSkillRed(skillCfg.skillId), "", 9, -8);
+            RedDotController.Instance.SetComRedDot(item.target, RedDotDataManager.Instance.GetCardSkillRed(skillCfg.skillId), "", -10, 10);
 
             if (item.target.data == null)
             {

GameClient/Assets/Game/HotUpdate/Views/Card/CardSkillView.cs

@@ -101,7 +101,7 @@ namespace GFGGame
             int needCount = skillLvCfg.materiarsArr[index][1];
             long hasCount = ItemDataManager.GetItemNum(skillLvCfg.materiarsArr[index][0]);
             listItem.m_txtNeedCount.text = needCount.ToString();
-            listItem.m_txtHasCount.text = StringUtil.GetColorText(hasCount.ToString(), hasCount < needCount ? "#D27869" : "#FDF3D7"); ;
+            listItem.m_txtHasCount.text = StringUtil.GetColorText(hasCount.ToString(), hasCount < needCount ? "#D27869" : "#716660"); ;
             listItem.m_btnPlus.visible = false;
             if (listItem.target.data == null)
             {

GameClient/Assets/Game/HotUpdate/Views/CommonGame/ApproachView.cs

@@ -297,7 +297,7 @@ namespace GFGGame
                     isJump = ViewManager.Show<ClothingListView>(null, _fromeViewDatas);
                     break;
                 case ConstFunctionId.DAILY_TASK:
-                    isJump = ViewManager.Show<CombTaskView>(null, _fromeViewDatas);
+                    isJump = ViewManager.Show<TaskView>(null, _fromeViewDatas);
                     break;
                 case ConstFunctionId.LEAGUE_PRAY:
                     isJump = ViewManager.Show<LeaguePrayView>(null, _fromeViewDatas);

GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpView.cs

@@ -207,7 +207,7 @@ namespace GFGGame
             if (_ui.m_comboBox.selectedIndex == currentIndex) return;
             if (CustomSuitDataManager.GetPosType(_ui.m_comboBox.selectedIndex) == MonthCardType.Gold && !RoleDataManager.CheckIsMonthCardOpenByType(MonthCardType.Gold))
             {
-                ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_MONTH_CARD, ConstStoreSubId.STORE_MONTH_GLOAD_CARD });
+                ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_MONTH_CARD, ConstStoreSubId.STORE_MONTH_GOLD_CARD });
                 _ui.m_comboBox.selectedIndex = currentIndex;
                 return;
             }

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

@@ -58,16 +58,8 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            List<ItemData> rewardList = this.viewData as List<ItemData>;
-            if (_rewardList.Count > 0)
-            {
-                _rewardList.AddRange(rewardList);
-                return;
-            }
-            else
-            {
-                _rewardList = rewardList;
-            }
+
+            _rewardList = this.viewData as List<ItemData>;
             _ui.m_btnPass.visible = false;
             // _newRewardList.Clear();
             // _oldRewardList.Clear();
@@ -206,6 +198,7 @@ namespace GFGGame
         {
             _ui.m_t_close.Stop(true, false);
             _ui.m_t_open.Stop(true, false);
+            _rewardList.Clear();
             base.OnHide();
         }
     }

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

@@ -1007,7 +1007,7 @@ namespace GFGGame
             RedDotController.Instance.SetComRedDot(_btnYouJian, RedDotDataManager.Instance.GetMailRed());
             RedDotController.Instance.SetComRedDot(_btnTuJian, RedDotDataManager.Instance.GetFieldGuideRed() || RedDotDataManager.Instance.GetTravelGuideRed());
             RedDotController.Instance.SetComRedDot(_btnHaoYou, RedDotDataManager.Instance.GetFriendRed());
-            RedDotController.Instance.SetComRedDot(_btnStore, RedDotDataManager.Instance.GetChargeAddUpReward() || RedDotDataManager.Instance.GetGiftBagReward());
+            RedDotController.Instance.SetComRedDot(_btnStore, RedDotDataManager.Instance.GetShopRed());
             RedDotController.Instance.SetComRedDot(_ui.m_btnField.target, RedDotDataManager.Instance.GetFieldRed(), "", 10);
             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);

GameClient/Assets/Game/HotUpdate/Views/RoleInfo/RoleInfoView.cs

@@ -136,7 +136,7 @@ namespace GFGGame
             if (RoleInfoManager.GetPosType(index) == MonthCardType.Gold && !RoleDataManager.CheckIsMonthCardOpenByType(MonthCardType.Gold))
             {
                 // PromptController.Instance.ShowFloatTextPrompt("金卡开启");
-                ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_MONTH_CARD, ConstStoreSubId.STORE_MONTH_GLOAD_CARD });
+                ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_MONTH_CARD, ConstStoreSubId.STORE_MONTH_GOLD_CARD });
                 return;
             }
             if (RoleInfoManager.GetPosType(index) == MonthCardType.BlackGold && !RoleDataManager.CheckIsMonthCardOpenByType(MonthCardType.BlackGold))

GameClient/Assets/Game/HotUpdate/Views/Store/StoreMonthView.cs

@@ -12,6 +12,7 @@ namespace GFGGame
         private UI_StoreMonthUI _ui;
         private ValueBarController _valueBarController;
         private List<ShopCfg> _shopCfgs;
+        private int menu2;
 
         public override void Dispose()
         {
@@ -48,6 +49,7 @@ namespace GFGGame
         {
             base.AddEventListener();
             EventAgent.AddEventListener(ConstMessage.SHOP_BUY, UpdateView);
+            EventAgent.AddEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
 
         }
         protected override void OnShown()
@@ -56,6 +58,7 @@ namespace GFGGame
 
             _valueBarController.OnShown();
             UpdateView();
+            UpdateRedDot();
         }
 
 
@@ -68,6 +71,7 @@ namespace GFGGame
         {
             base.RemoveEventListener();
             EventAgent.RemoveEventListener(ConstMessage.SHOP_BUY, UpdateView);
+            EventAgent.RemoveEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
         }
         private void OnBtnBlackRewardClick()
         {
@@ -75,7 +79,7 @@ namespace GFGGame
         }
         private void UpdateView()
         {
-            int menu2 = (int)this.viewData;
+            menu2 = (int)this.viewData;
             _shopCfgs = ShopCfgArray.Instance.GetCfgsBymenu1Andmenu2(ConstStoreTabId.STORE_MONTH_CARD, menu2);
             _shopCfgs = ShopDataManager.Instance.RemoveNotOpenCfg(_shopCfgs);
             _shopCfgs = ShopDataManager.Instance.SortShopGoodsCfgs(_shopCfgs);
@@ -91,7 +95,7 @@ namespace GFGGame
             MonthlyCardCfg monthCfg = null;
             switch (menu2)
             {
-                case ConstStoreSubId.STORE_MONTH_GLOAD_CARD:
+                case ConstStoreSubId.STORE_MONTH_GOLD_CARD:
                     iconUrl = "ui://Store/MonthCard_Icon";
                     monthCfg = MonthlyCardCfgArray.Instance.GetCfg(MonthCardType.Gold);
                     isFirstBuy = GameGlobal.myNumericComponent.GetAsInt(NumericType.MonthCardGoldFirstBuy) <= 0;
@@ -188,5 +192,10 @@ namespace GFGGame
                 }
             }
         }
+
+        private void UpdateRedDot()
+        {
+            RedDotController.Instance.SetComRedDot(_ui.m_btnGet, menu2 == ConstStoreSubId.STORE_MONTH_GOLD_CARD && RedDotDataManager.Instance.GetGoldCardRewardRed() || menu2 == ConstStoreSubId.STORE_MONTH_BLACK_CARD && RedDotDataManager.Instance.GetBlackCardRewardRed());
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/Store/StoreView.cs

@@ -201,11 +201,26 @@ namespace GFGGame
         }
         private void UpdateRedDot()
         {
-            RedDotController.Instance.SetComRedDot(_ui.m_comTab.m_btn0.target, RedDotDataManager.Instance.GetChargeAddUpReward());
-            RedDotController.Instance.SetComRedDot(_ui.m_listSubTab.GetChildAt(ConstStoreSubId.STORE_CHARGE_ADDUP).asCom, RedDotDataManager.Instance.GetChargeAddUpReward() && (_ui.m_comTab.m_c1.selectedIndex == ConstStoreTabId.STORE_CHARGE));
+            RedDotController.Instance.SetComRedDot(_ui.m_comTab.m_btn0.target, RedDotDataManager.Instance.GetChargeAddUpRewardRed());
+            if (_ui.m_comTab.m_c1.selectedIndex == ConstStoreTabId.STORE_CHARGE)
+            {
+                RedDotController.Instance.SetComRedDot(_ui.m_listSubTab.GetChildAt(ConstStoreSubId.STORE_CHARGE_ADDUP).asCom, RedDotDataManager.Instance.GetChargeAddUpRewardRed());
+            }
+
+            RedDotController.Instance.SetComRedDot(_ui.m_comTab.m_btn1.target, RedDotDataManager.Instance.GetGoldCardRewardRed() || RedDotDataManager.Instance.GetBlackCardRewardRed());
+            if (_ui.m_comTab.m_c1.selectedIndex == ConstStoreTabId.STORE_MONTH_CARD)
+            {
+                RedDotController.Instance.SetComRedDot(_ui.m_listSubTab.GetChildAt(ConstStoreSubId.STORE_MONTH_GOLD_CARD).asCom, RedDotDataManager.Instance.GetGoldCardRewardRed());
+                RedDotController.Instance.SetComRedDot(_ui.m_listSubTab.GetChildAt(ConstStoreSubId.STORE_MONTH_BLACK_CARD).asCom, RedDotDataManager.Instance.GetBlackCardRewardRed());
+            }
+
+            RedDotController.Instance.SetComRedDot(_ui.m_comTab.m_btn2.target, RedDotDataManager.Instance.GetGiftBagRewardRed());
+            if (_ui.m_comTab.m_c1.selectedIndex == ConstStoreTabId.STORE_GIFT_BAG)
+            {
+                RedDotController.Instance.SetComRedDot(_ui.m_listSubTab.GetChildAt(ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY).asCom, RedDotDataManager.Instance.GetGiftBagRewardRed());
+            }
+
 
-            RedDotController.Instance.SetComRedDot(_ui.m_comTab.m_btn2.target, RedDotDataManager.Instance.GetGiftBagReward());
-            RedDotController.Instance.SetComRedDot(_ui.m_listSubTab.GetChildAt(ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY).asCom, RedDotDataManager.Instance.GetGiftBagReward() && (_ui.m_comTab.m_c1.selectedIndex == ConstStoreTabId.STORE_GIFT_BAG));
         }
     }
 }