feat 任务修改

FGUIProject/assets/Task/BattlePassRewardUI.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920" opaque="false">
-  <controller name="c1" pages="0,打开购买,1,关闭购买" selected="0"/>
+  <controller name="c1" pages="0,打开购买通行证,1,关闭购买通行证" selected="1"/>
   <displayList>
     <image id="n15_nd17" name="n15" src="uxxstmf" fileName="images/sj_dk.png" xy="0,240">
       <relation target="" sidePair="left-right"/>
@@ -11,11 +11,13 @@
       <relation target="" sidePair="left-left"/>
       <ProgressBar value="50" max="100"/>
     </component>
-    <component id="n56_itts" name="btnBuyLevel" src="nd1745" fileName="components/ButtonOpenBattlePass.xml" xy="401,943">
+    <component id="n56_itts" name="btnBuyLevel" src="ittstnj" fileName="components/ButtonBuyBattlePassLevel.xml" xy="778,570">
+      <gearDisplay controller="c1" pages="1"/>
       <relation target="" sidePair="right-right"/>
       <property target="text" propertyId="0" value="购买等级"/>
     </component>
     <component id="n49_nd17" name="btnOpen" src="nd1745" fileName="components/ButtonOpenBattlePass.xml" xy="778,570">
+      <gearDisplay controller="c1" pages="0"/>
       <relation target="" sidePair="right-right"/>
     </component>
     <image id="n33_nd17" name="n33" src="uxxstme" fileName="images/txz_nr_db.png" xy="0,683" size="1080,1263"/>

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

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using ET;
 
 namespace GFGGame
 {
@@ -9,35 +10,42 @@ namespace GFGGame
 
         //是否购买通行证
         private bool IsBuy = false;
-        
-        
+
+
+        private long SeasonEndTime = 0;
+
 
         //已经领奖levelId
         private HashSet<int> NormalRewards = new HashSet<int>();
 
         //已经高级领奖levelId
         private HashSet<int> SuperRewards = new HashSet<int>();
-        
+
         public int GetSeasonId()
         {
             return SeasonId;
         }
-        
+
         public void AddNormalReward(int levelId)
         {
             NormalRewards.Add(levelId);
         }
-        
+
         public void AddSuperReward(int levelId)
         {
             SuperRewards.Add(levelId);
         }
-        
+
         public void SetSeasonId(int seasonId)
         {
             SeasonId = seasonId;
+            //设置赛季结束时间
+            //获取赛季配置
+            var seasonCfg = BattlePassOpenCfgArray.Instance.GetCfg(seasonId);
+            if (seasonCfg == null) return;
+            SeasonEndTime = TimeUtil.GetResetTimeSec(seasonCfg.endTime);
         }
-        
+
         public void SetIsBuy(bool isBuy)
         {
             IsBuy = isBuy;
@@ -48,11 +56,23 @@ namespace GFGGame
         {
             return NormalRewards.Contains(levelId);
         }
-        
+
         //检查高级领取状态
         public bool CheckSuperLevelRewardGet(int levelId)
         {
             return SuperRewards.Contains(levelId);
         }
+
+        //获取赛季结束时间
+        public long GetSeasonEndTime()
+        {
+            return SeasonEndTime;
+        }
+
+        //获取通行证当前等级
+        public int GetBattlePassLevel()
+        {
+            return GameGlobal.myNumericComponent.GetAsInt(NumericType.PassLevel);
+        }
     }
 }

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

@@ -19,7 +19,7 @@ namespace GFGGame
         {
             get
             {
-                return GameGlobal.myNumericComponent.GetAsInt(NumericType.TakeFriendGiftCount); ;
+                return GameGlobal.myNumericComponent.GetAsInt(NumericType.TakeFriendGiftCount);
             }
         }
 

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

@@ -40,7 +40,7 @@ namespace GFGGame
             _ui.m_btnGetAll.onClick.Add(OnBtnGetAllClick);
             _ui.m_RewardList.itemRenderer = ListBoxRewardItemRender;
         }
-        
+
 
         protected override void OnShown()
         {
@@ -50,8 +50,10 @@ namespace GFGGame
             _rewardCfgs = new List<BattlePassCfg>(BattlePassCfgArray.Instance.GetCfgsByid(seasonId));
             //去掉第一个为0的配置
             _ui.m_RewardList.numItems = _rewardCfgs.Count - 1;
+            SetSeasonLeftTime();
+            SetBattlePassLevel();
         }
-        
+
 
         //开启通行证
         private void OnBtnOpenClick(EventContext context)
@@ -60,7 +62,6 @@ namespace GFGGame
 
         private void OnBtnBuyLevel(EventContext context)
         {
-            
         }
 
         //领取奖励
@@ -178,12 +179,46 @@ namespace GFGGame
 
             item.m_GetRewardBt.data = id;
         }
-        
+
+        //设置赛季剩余时间
+        private void SetSeasonLeftTime()
+        {
+            //获取赛季结束时间
+            Timers.inst.Add(1, 0, UpdateTime);
+        }
+
+        //UpdateTime
+        private void UpdateTime(object param)
+        {
+            var seasonEndTime = BattlePassTaskDataManager.Instance.GetSeasonEndTime();
+            var leftTime = seasonEndTime - TimeHelper.ServerNow();
+            if (leftTime <= 0)
+            {
+                Timers.inst.Remove(UpdateTime);
+                return;
+            }
+            _ui.m_LeftTime.text = TimeUtil.FormattingTime(TimeHelper.ServerNow(), seasonEndTime);
+        }
+
+
+        private void SetBattlePassLevel()
+        {
+            //获取玩家当前的通行证等级
+            var dataManager = BattlePassTaskDataManager.Instance;
+            var battlePassLevel = dataManager.GetBattlePassLevel();
+            var uiExpProcess = _ui.m_LevelProcess;
+            uiExpProcess.m_Level.text = battlePassLevel.ToString();
+            //获取当前等级的经验
+            var battlePassCfg =
+                BattlePassCfgArray.Instance.GetCfgByidAndlevel(dataManager.GetSeasonId(),
+                    dataManager.GetBattlePassLevel());
+            uiExpProcess.target.max = battlePassCfg.value;
+            uiExpProcess.target.value = 50;
+        }
+
         //刷新特别大奖展示
         private void FreshSpecialReward()
         {
-            
         }
-        
     }
 }