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

FGUIProject/assets/Arena/ArenaLoadingUI.xml

@@ -2,7 +2,7 @@
 <component size="1080,1920">
   <displayList>
     <loader id="n0_rv09" name="loaBg" xy="0,-240" size="1080,2400" fill="scale">
-      <relation target="" sidePair="width-width,height-height"/>
+      <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
     <component id="n1_rv09" name="progressBar1" src="rv0955" fileName="components/ProgressBar2.xml" xy="95,1676" group="n4_rv09">
       <relation target="" sidePair="center-center,bottom-bottom"/>

FGUIProject/assets/DailyWelfare/components/ListItem.xml

@@ -3,8 +3,8 @@
   <displayList>
     <loader id="n2_ox5b" name="loaBg" xy="0,0" size="270,334" url="ui://t8nwuj7iox5ba" autoSize="true"/>
     <loader id="n3_ox5b" name="loaIcon" xy="60,98" size="150,150" aspect="true" url="ui://eg2y0ldpm9wm8v" fill="scaleMatchHeight"/>
-    <text id="n6_ox5b" name="txtNum" xy="171,220" size="67,44" fontSize="32" color="#be675e" text="X88"/>
+    <text id="n6_ox5b" name="txtNum" xy="171,220" size="59,44" fontSize="32" color="#be675e" text="X88"/>
     <text id="n5_ox5b" name="txtName" xy="99,281" pivot="0.5,0" size="71,46" fontSize="34" color="#91a08b" text="名字"/>
-    <image id="n4_ox5b" name="imgGot" src="ox5b8" fileName="images/yzhl_yqd.png" xy="0,0"/>
+    <image id="n4_ox5b" name="imgGot" src="ox5b8" fileName="images/yzhl_yqd.png" xy="0,0" pivot="0.5,0.5"/>
   </displayList>
 </component>

FGUIProject/assets/Main/components/ComScoreResult.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="256,259">
-  <controller name="c1" pages="0,,1,,2," selected="2"/>
+  <controller name="c1" pages="0,,1,,2," selected="0"/>
   <displayList>
     <graph id="n28_qkjs" name="holderResult" xy="130,130" pivot="0.5,0.5" anchor="true" size="30,30" type="rect"/>
     <image id="n18_f2bf" name="n18" src="qkjsli" fileName="imagesNew/font_zdqp_dikuang.png" xy="122,126" pivot="0.48,0.48" anchor="true" visible="false"/>
@@ -31,7 +31,7 @@
     <item time="0" type="Visible" target="n27_qkjs" value="false"/>
     <item time="0" type="Visible" target="n28_qkjs" value="false"/>
     <item time="26" type="Visible" target="n27_qkjs" value="true"/>
-    <item time="28" type="Visible" target="n21_f2bf" label="perfect" value="true"/>
+    <item time="30" type="Visible" target="n21_f2bf" label="perfect" value="true"/>
     <item time="42" type="Visible" target="n21_f2bf" value="false"/>
   </transition>
   <transition name="t1">

GameClient/Assets/Editor/Excel/Scanner/ItemApproachScanner.cs

@@ -41,7 +41,10 @@ namespace GFGEditor
                 //套装
                 foreach (var a in suitDic)
                 {
-                    suitPartTotalCount += a.Value.Count;
+                    if(a.Key.isHide <= 0)
+                    {
+                        suitPartTotalCount += a.Value.Count;
+                    }
                     var names = new string[] { nameof(a.Key.partsArr).Replace("Arr", "") };
                     var values = new string[] { string.Join(";", a.Value) };
                     SQLiteHelper.Instance.UpdateValues(nameof(SuitCfgArray), names, values, nameof(a.Key.id), a.Key.id.ToString());

GameClient/Assets/Game/HotUpdate/Controller/GameController.cs

@@ -182,6 +182,8 @@ namespace GFGGame
             ActivityGlobalDataManager.Instance.Clear();
             EnduringGiftBoxDataManager.Instance.Clear();
             LimitedTimeGiftBoxDataManager.Instance.Clear();
+            BattlePassTaskDataManager.Instance.Clear();
+            TaskDataManager.Instance.Clear();
             GameGlobal.zoneScene.GetComponent<SessionComponent>()?.Disconnect();
             GameGlobal.zoneScene.GetComponent<ServerInfosComponent>()?.ServerInfoList?.Clear();
             GameGlobal.zoneScene.GetComponent<AccountInfoComponent>()?.Clear();

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

@@ -174,5 +174,16 @@ namespace GFGGame
             }
             return false;
         }
+
+        public void Clear()
+        {
+            SeasonId = 0;
+            IsBuy = false;
+            SeasonEndTime = 0;
+            selectionCache = null;
+            NormalRewards.Clear();
+            SuperRewards.Clear();
+            tempItems.Clear();
+        }
     }
 }

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

@@ -162,7 +162,7 @@ namespace GFGGame
         /// 任务界面跳转
         /// </summary>
         /// <param name="jumpId"></param>
-        public void JumpToView(string jumpId, object[] goBackDatas)
+        public void JumpToView(string jumpId, object[] param, object[] goBackDatas)
         {
             switch (jumpId)
             {
@@ -179,10 +179,20 @@ namespace GFGGame
                     }
 
                     break;
+                case nameof(StoreView):
+                    ViewManager.Show(goBackDatas[0].ToString(), goBackDatas.Length > 1 ? goBackDatas[1] : null);
+                    ViewManager.Show<StoreView>(param, goBackDatas);
+                    break;
                 default:
                     ViewManager.Show($"GFGGame.{jumpId}", null, goBackDatas, true, true);
                     break;
             }
         }
+
+        public void Clear()
+        {
+            TaskInfosDic.Clear();
+            TaskType2TaskIdListDic.Clear();
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Utils/SuitUtil.cs

@@ -237,6 +237,11 @@ namespace GFGGame
             List<int> result = new List<int>();
             void CheckToAdd(int targetId)
             {
+                SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(targetId);
+                if(suitCfg == null || suitCfg.isHide > 0)
+                {
+                    return;
+                }
                 if (notGet && haveGot)
                 {
                     result.Add(targetId);

GameClient/Assets/Game/HotUpdate/Views/ActivityDay7/ActivityDay7View.cs

@@ -255,14 +255,14 @@ namespace GFGGame
             var get = ActivityDay7DataManager.Instance.GetActivityDay7RewardState(id);
             if (get)
             {
-                PromptController.Instance.ShowFloatTextPrompt("已领取过了");
+                GoodsItemTipsController.ShowItemTips(activity7DaysCfg.bonusArr[0][0]);
                 return;
             }
             //判断积分是否够
             var score = ActivityDay7DataManager.Instance.GetScore();
             if (score < activity7DaysCfg.score)
             {
-                PromptController.Instance.ShowFloatTextPrompt("积分还不够");
+                GoodsItemTipsController.ShowItemTips(activity7DaysCfg.bonusArr[0][0]);
                 return;
             }
             var result = await ActivityDay7SProxy.ReqGetActivityDay7Reward(activity7DaysCfg);

GameClient/Assets/Game/HotUpdate/Views/ActivityThemeLuckyBox/ActivityThemeLuckyBoxTaskView.cs

@@ -76,7 +76,7 @@ namespace GFGGame
             {
                 item.m_btnGo.onClick.Add(OnBtnGoClick);
             }
-            item.m_btnGo.data = _taskCfgs[index].jumpId;
+            item.m_btnGo.data = _taskCfgs[index];
 
             if (item.m_listRewards.data == null)
             {
@@ -112,7 +112,13 @@ namespace GFGGame
         {
             // Hide();
             if (!(context.sender is GObject btnGo)) return;
-            TaskDataManager.Instance.JumpToView(btnGo.data.ToString(), new object[] { typeof(ActivityThemeLuckyBoxView).FullName, true });
+            TaskCfg taskCfg = btnGo.data as TaskCfg;
+            object[] param = new object[taskCfg.jumpParamArr.Length];
+            for (int i = 0; i < taskCfg.jumpParamArr.Length; i++)
+            {
+                param[i] = taskCfg.jumpParamArr[i];
+            }
+            TaskDataManager.Instance.JumpToView(taskCfg.jumpId, param, new object[] { typeof(ActivityThemeLuckyBoxView).FullName, true });
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingFosterView.cs

@@ -99,7 +99,7 @@ namespace GFGGame
         {
             int[] itemData = (int[])(context.data as GComponent).data;
             // ViewManager.Show(ViewName.APPROACH_OF_ITEM_VIEW, new object[] { itemData[0], new object[] { typeof(ClothingView).FullName, (this.viewData as object[])[4] }, itemData[1] });
-            object[] sourceDatas = new object[] { itemData[0], new object[] { typeof(ClothingView).FullName, (this.viewData as object[])[4] }, itemData[1] };
+            object[] sourceDatas = new object[] { itemData[0], new object[] { typeof(ClothingView).FullName, (this.viewData as object[])[3] }, itemData[1] };
             GoodsItemTipsController.ShowItemTips(itemData[0], sourceDatas);
         }
 

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

@@ -79,6 +79,7 @@ namespace GFGGame
             ShowBonusList();
 
             _ui.m_t0.Play(UpdateView);
+            //
         }
 
         protected override void OnHide()
@@ -137,9 +138,9 @@ namespace GFGGame
         {
 
             _ui.m_loaMask.visible = false;
-            int[][] bonus = LuckyBoxCfgArray.Instance.GetCfg(LuckyBoxDataManager.Instance.luckyBoxId).bonusArr;
-            List<ItemData> itemDatas = ItemUtil.CreateItemDataList(bonus, LuckyBoxDataManager.Instance.times);
-            ViewManager.Show<LuckyBoxNewDressView>(itemDatas);
+            // int[][] bonus = LuckyBoxCfgArray.Instance.GetCfg(LuckyBoxDataManager.Instance.luckyBoxId).bonusArr;
+            // List<ItemData> itemDatas = ItemUtil.CreateItemDataList(bonus, LuckyBoxDataManager.Instance.times);
+            // ViewManager.Show<LuckyBoxNewDressView>(itemDatas);
         }
         private void ShowBonusList()
         {

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightTargetScoreView.cs

@@ -567,11 +567,11 @@ namespace GFGGame
         {
             //登峰造极评分开始
             _isAllPerfect = true;
-            _ui.m_comClick.target.touchable = !FightDataManager.Instance.autoPlay;
+            _ui.m_comClick.target.touchable = !_isAutoPlay;
             _ui.m_comClick.m_comAllPerfect.target.visible = true;
-            _ui.m_comClick.m_comAllPerfect.m_c1.selectedIndex = FightDataManager.Instance.autoPlay ? 1 : 0;
+            _ui.m_comClick.m_comAllPerfect.m_c1.selectedIndex = _isAutoPlay ? 1 : 0;
             _ui.m_comClick.m_comAllPerfect.m_t0.timeScale = FightDataManager.Instance.fightSpeed;// 1 / _speed;
-            if (FightDataManager.Instance.autoPlay)
+            if (_isAutoPlay)
             {
                 _ui.m_comClick.m_comAllPerfect.m_t0.Play(OnComAllCircleClickBegin);
             }
@@ -602,7 +602,7 @@ namespace GFGGame
             Timers.inst.Remove(ComAllCirclePressTime);
 
             int allCircleScore = 0;
-            if (_time >= ConstScoreSystem.LONG_PRESS_TIME / FightDataManager.Instance.fightSpeed || FightDataManager.Instance.autoPlay)
+            if (_time >= ConstScoreSystem.LONG_PRESS_TIME / FightDataManager.Instance.fightSpeed || _isAutoPlay)
             {
                 allCircleScore = ScoreSystemData.Instance.GetAllCircleAddScore(_mainScore);
             }
@@ -683,6 +683,7 @@ namespace GFGGame
             _ui.m_comClick.m_comAllPerfect.m_t2.Stop(true, false);
 
             _isAllPerfect = false;
+            _prefectCount = 0;
 
             _ui.m_proScore.m_txtNpcScore.text = "";
             _ui.m_proScore.m_txtMineScore.text = "";

GameClient/Assets/Game/HotUpdate/Views/MainStory/StorySkillView.cs

@@ -67,7 +67,7 @@ namespace GFGGame
                 if (string.IsNullOrEmpty(skillCfg.res))
                 {
                     res = ItemCfgArray.Instance.GetCfg(skillCfg.cardId).res;
-                    ET.Log.Error("技能" + skillCfg.skillId + "  未配资源");
+                    // ET.Log.Debug("技能" + skillCfg.skillId + "  未配资源");
                 }
                 _ui.m_comSkillShow.m_comSkillCard.m_comCard.m_loaCard.url = ResPathUtil.GetCardPath(res);
                 _ui.m_comSkillShow.m_t0.timeScale = FightDataManager.Instance.fightSpeed;

GameClient/Assets/Game/HotUpdate/Views/Task/BattlePassTaskView.cs

@@ -64,7 +64,6 @@ namespace GFGGame
                     let state = BattlePassTaskDataManager.Instance.GetRewardState(battlePassCfg.level)
                     where battlePassCfg.level != 0 && state != 2
                     select battlePassCfg.level).FirstOrDefault();
-            // var index = _ui.m_RewardList.ItemIndexToChildIndex(minLevel - 1);
             _ui.m_RewardList.ScrollToView(minLevel - 1);
         }
 
@@ -73,13 +72,30 @@ namespace GFGGame
             base.AddEventListener();
             //监听通行证等级变化
             EventAgent.AddEventListener(ConstMessage.BATTLEPASS_LEVEL_CHANGE, SetBattlePassLevel);
-            EventAgent.AddEventListener(ConstMessage.NOTICE_PASSPORT_OPEN, SetOpenBattlePassBtnStatus);
+            EventAgent.AddEventListener(ConstMessage.NOTICE_PASSPORT_OPEN, OnBattlePassOpen);
+            EventAgent.AddEventListener(ConstMessage.ITEM_CHANGED, OnItemChange);
         }
 
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
             EventAgent.RemoveEventListener(ConstMessage.BATTLEPASS_LEVEL_CHANGE, SetBattlePassLevel);
+            EventAgent.RemoveEventListener(ConstMessage.NOTICE_PASSPORT_OPEN, OnBattlePassOpen);
+            EventAgent.RemoveEventListener(ConstMessage.ITEM_CHANGED, OnItemChange);
+        }
+
+        private void OnBattlePassOpen()
+        {
+            SetOpenBattlePassBtnStatus();
+            FreshReward();
+        }
+
+        private void OnItemChange(EventContext eventContext)
+        {
+            var itemId = (int)eventContext.data;
+            if (itemId != ConstItemID.BATTLE_PASS_CURRENCY) return;
+            //刷新积分列表
+            SetExpProcess();
         }
 
 
@@ -127,10 +143,9 @@ namespace GFGGame
             {
                 var isBuy = BattlePassTaskDataManager.Instance.GetIsBuy();
                 if (isBuy) return;
-                ViewManager.Show<BuyBattlePassLevelView>(null,
+                ViewManager.Show<OpenBattlePassView>(null,
                     new object[] { typeof(BattlePassTaskView).FullName, null });
             });
-            SetBattlePassLevel();
             if (!get) return;
             SetBattlePassLevel();
         }
@@ -250,9 +265,16 @@ namespace GFGGame
             //获取玩家当前的通行证等级
             var dataManager = BattlePassTaskDataManager.Instance;
             var battlePassLevel = dataManager.GetBattlePassLevel();
-            var seasonId = dataManager.GetSeasonId();
             var uiExpProcess = _ui.m_LevelProcess;
             uiExpProcess.m_Level.text = battlePassLevel.ToString();
+            SetExpProcess();
+        }
+
+        private void SetExpProcess()
+        {
+            var dataManager = BattlePassTaskDataManager.Instance;
+            var seasonId = dataManager.GetSeasonId();
+            var uiExpProcess = _ui.m_LevelProcess;
             //获取当前等级的经验
             var battlePassCfg =
                 BattlePassCfgArray.Instance.GetCfgByidAndlevel(seasonId, dataManager.GetBattlePassLevel());
@@ -269,13 +291,20 @@ namespace GFGGame
                 uiExpProcess.target.value = dataManager.GetBattlePassExp();
                 uiExpProcess.m_NumProcess.SetVar("value", dataManager.GetBattlePassExp().ToString())
                     .SetVar("maxValue", battlePassCfg.value.ToString()).FlushVars();
-                //刷新奖励列表
-                _rewardCfgs = new List<BattlePassCfg>(BattlePassCfgArray.Instance.GetCfgsByid(seasonId));
-                //去掉第一个为0的配置
-                _ui.m_RewardList.numItems = _rewardCfgs.Count - 1;
+                FreshReward();
             }
         }
 
+        private void FreshReward()
+        {
+            //刷新奖励列表
+            _rewardCfgs =
+                new List<BattlePassCfg>(
+                    BattlePassCfgArray.Instance.GetCfgsByid(BattlePassTaskDataManager.Instance.GetSeasonId()));
+            //去掉第一个为0的配置
+            _ui.m_RewardList.numItems = _rewardCfgs.Count - 1;
+        }
+
         private void SetOpenBattlePassBtnStatus()
         {
             //通行证是否购买

GameClient/Assets/Game/HotUpdate/Views/Task/CombTaskView.cs

@@ -137,7 +137,7 @@ namespace GFGGame
             {
                 item.m_ComeBt.onClick.Add(OnBtnGoClick);
             }
-            item.m_ComeBt.data = _cfgs[index].jumpId;
+            item.m_ComeBt.data = _cfgs[index];
             if (item.m_listTaskReward.data == null)
             {
                 item.m_listTaskReward.itemRenderer = ListTaskRewardItemRender;
@@ -172,7 +172,13 @@ namespace GFGGame
         {
             Hide();
             if (!(context.sender is GObject btnGo)) return;
-            TaskDataManager.Instance.JumpToView(btnGo.data.ToString(), new[] { typeof(TaskView).FullName, viewData });
+            TaskCfg taskCfg = btnGo.data as TaskCfg;
+            object[] param = new object[taskCfg.jumpParamArr.Length];
+            for (int i = 0; i < taskCfg.jumpParamArr.Length; i++)
+            {
+                param[i] = taskCfg.jumpParamArr[i];
+            }
+            TaskDataManager.Instance.JumpToView(taskCfg.jumpId, param, new[] { typeof(TaskView).FullName, viewData });
         }
 
         private async void OnBtnGetAllClick()
@@ -193,17 +199,17 @@ namespace GFGGame
             switch (state)
             {
                 case ConstBonusStatus.CAN_NOT_GET:
-                {
-                    var rewards = ItemUtil.CreateItemDataList(cfg.rewardsArr);
-                    ViewManager.Show<RewardPreView>(new object[] { rewards, "活跃度奖励", $"满足{cfg.count}活跃度可领取" });
-                    break;
-                }
+                    {
+                        var rewards = ItemUtil.CreateItemDataList(cfg.rewardsArr);
+                        ViewManager.Show<RewardPreView>(new object[] { rewards, "活跃度奖励", $"满足{cfg.count}活跃度可领取" });
+                        break;
+                    }
                 case ConstBonusStatus.CAN_GET:
-                {
-                    var result = await DailyTaskSProxy.ReqLivenessBox(cfg.id);
-                    if (result) UpdateLivenessProcess();
-                    break;
-                }
+                    {
+                        var result = await DailyTaskSProxy.ReqLivenessBox(cfg.id);
+                        if (result) UpdateLivenessProcess();
+                        break;
+                    }
                 case ConstBonusStatus.GOT:
                     //领取完毕
                     break;