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

FGUIProject/assets/Task/BattlePassRewardUI.xml

@@ -5,7 +5,7 @@
     <image id="n15_nd17" name="n15" src="uxxstmf" fileName="images/sj_dk.png" xy="0,240">
       <relation target="" sidePair="left-right"/>
     </image>
-    <text id="n19_nd17" name="LeftTime" xy="59,240" size="172,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#fffaec" autoSize="none" text="9天1时5分"/>
+    <text id="n19_nd17" name="LeftTime" xy="37,240" size="200,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#fffaec" autoSize="none" text="15天24时60分"/>
     <component id="n16_nd17" name="tip" src="nyhmtly" fileName="components/ButtonRed.xml" pkg="eg2y0ldp" xy="246,233" size="61,61"/>
     <component id="n18_nd17" name="LevelProcess" src="e3m1tnl" fileName="components/ExpProcess.xml" xy="107,601">
       <relation target="" sidePair="left-left"/>

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

@@ -141,16 +141,22 @@ namespace GFGGame
                         name = EctypeCfgArray.Instance
                             .GetCfgBytypeAndsubType(taskCfg.paramsArr[0], taskCfg.paramsArr[1]).subName;
                     }
-                    return string.Format(activeRewardCfg.desc, taskCfg.count, name);
+                    return string.Format(activeRewardCfg.desc, taskCfg.GetTargetCount(), name);
                 case ConstTaskType.UseItem:
                     var cfg = ItemCfgArray.Instance.GetCfg(taskCfg.paramsArr[0]);
-                    return string.Format(activeRewardCfg.desc, taskCfg.count, cfg.name);
+                    return string.Format(activeRewardCfg.desc, taskCfg.GetTargetCount(), cfg.name);
                 case ConstTaskType.UpgradeCardLvl:
                 case ConstTaskType.UpgradeCardStar:
                     return string.Format(activeRewardCfg.desc, taskCfg.paramsArr[0], taskCfg.paramsArr[1]);
-                default: return string.Format(activeRewardCfg.desc, taskCfg.count);
+                case ConstTaskType.FinishStory:
+                case ConstTaskType.FinishInstanceZones:
+                {
+                    return string.Format(activeRewardCfg.desc, taskCfg.paramsArr[0]);
+                }
+                default: return string.Format(activeRewardCfg.desc, taskCfg.GetTargetCount());
             }
         }
+
         /// <summary>
         /// 任务界面跳转
         /// </summary>
@@ -164,7 +170,7 @@ namespace GFGGame
                     if (LeagueDataManager.Instance.Type == 1)
                     {
                         ViewManager.Show<LeagueView>(null, goBackDatas, true);
-                        ViewManager.Show($"GFGGame.{jumpId}", null);
+                        ViewManager.Show($"GFGGame.{jumpId}");
                     }
                     else
                     {

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

@@ -147,7 +147,7 @@ namespace GFGGame
             item.m_c2.selectedIndex = taskCfg.jumpId == "" ? 1 : 0;
             item.m_txtDesc.text = TaskDataManager.Instance.GetTaskDesc(taskCfg.id);
             item.m_txtCount.text =
-                $"{TaskDataManager.Instance.GetTaskProgressById(taskCfg.id)}/{taskCfg.count}";
+                $"{TaskDataManager.Instance.GetTaskProgressById(taskCfg.id)}/{taskCfg.GetTargetCount()}";
             if (item.m_GetRewardBt.data == null)
             {
                 item.m_GetRewardBt.onClick.Add(OnBtnGetClick);

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

@@ -64,7 +64,7 @@ namespace GFGGame
             //领取状态
             int state = TaskDataManager.Instance.GetTaskStateById(_taskCfgs[index].id);
             item.m_c1.selectedIndex = state == ConstBonusStatus.CAN_NOT_GET && !string.IsNullOrEmpty(_taskCfgs[index].jumpId) ? 3 : state;
-            item.m_txtTitle.text = string.Format("{0}({1}/{2})", TaskDataManager.Instance.GetTaskDesc(_taskCfgs[index].id), TaskDataManager.Instance.GetTaskProgressById(_taskCfgs[index].id), _taskCfgs[index].count);
+            item.m_txtTitle.text = string.Format("{0}({1}/{2})", TaskDataManager.Instance.GetTaskDesc(_taskCfgs[index].id), TaskDataManager.Instance.GetTaskProgressById(_taskCfgs[index].id), _taskCfgs[index].GetTargetCount());
 
             if (item.m_btnGet.data == null)
             {

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

@@ -127,7 +127,7 @@ namespace GFGGame
             item.m_c2.selectedIndex = _cfgs[index].jumpId == "" ? 1 : 0;
             item.m_txtDesc.text = TaskDataManager.Instance.GetTaskDesc(_cfgs[index].id);
             item.m_txtCount.text =
-                $"{TaskDataManager.Instance.GetTaskProgressById(_cfgs[index].id)}/{_cfgs[index].count}";
+                $"{TaskDataManager.Instance.GetTaskProgressById(_cfgs[index].id)}/{_cfgs[index].GetTargetCount()}";
             if (item.m_GetRewardBt.data == null)
             {
                 item.m_GetRewardBt.onClick.Add(OnBtnGetClick);