Ver código fonte

feat 7日任务修改

Jae 2 anos atrás
pai
commit
687672a565
26 arquivos alterados com 332 adições e 143 exclusões
  1. 2 2
      FGUIProject/assets/ActivityDay7/ActivityDay7UI.xml
  2. 2 1
      FGUIProject/assets/ActivityDay7/components/ButtonDay.xml
  3. 23 7
      FGUIProject/assets/ActivityDay7/components/ExpProcessItem.xml
  4. 1 1
      FGUIProject/assets/ActivityDay7/package.xml
  5. 2 2
      FGUIProject/assets/CommonGame/package.xml
  6. 1 0
      FGUIProject/assets/Main/MainUI.xml
  7. 1 1
      FGUIProject/assets/Task/BattlePassRewardUI.xml
  8. 6 4
      FGUIProject/assets/Task/CombTaskUI.xml
  9. 12 0
      GameClient/Assets/Game/HotUpdate/Data/ActivityDay7DataManager.cs
  10. 22 1
      GameClient/Assets/Game/HotUpdate/Data/TaskDataManager.cs
  11. 3 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityDay7/UI_ButtonDay.cs
  12. 18 6
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityDay7/UI_ExpProcessItem.cs
  13. 3 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_MainUI.cs
  14. 18 0
      GameClient/Assets/Game/HotUpdate/ServerProxy/ActivityDay7SProxy.cs
  15. 3 0
      GameClient/Assets/Game/HotUpdate/ServerProxy/ActivityDay7SProxy.cs.meta
  16. 68 35
      GameClient/Assets/Game/HotUpdate/Views/ActivityDay7/ActivityDay7View.cs
  17. 146 80
      GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs
  18. 1 2
      GameClient/Assets/Game/HotUpdate/Views/Task/BattlePassTaskView.cs
  19. 0 1
      GameClient/Assets/Game/HotUpdate/Views/Task/BuyBattlePassLevelView.cs
  20. BIN
      GameClient/Assets/ResIn/UI/ActivityDay7/ActivityDay7_atlas0!a.png
  21. BIN
      GameClient/Assets/ResIn/UI/ActivityDay7/ActivityDay7_atlas0.png
  22. BIN
      GameClient/Assets/ResIn/UI/ActivityDay7/ActivityDay7_fui.bytes
  23. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0!a.png
  24. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0.png
  25. BIN
      GameClient/Assets/ResIn/UI/Main/Main_fui.bytes
  26. BIN
      GameClient/Assets/ResIn/UI/Task/Task_fui.bytes

+ 2 - 2
FGUIProject/assets/ActivityDay7/ActivityDay7UI.xml

@@ -34,7 +34,7 @@
       <item/>
       <item/>
     </list>
-    <loader id="n14_jttb" name="StartIndex" xy="96,810" size="166,93" url="ui://kupdwln7nyhmc"/>
-    <loader id="n22_jttb" name="EndIndex" xy="79,152" size="159,98" url="ui://kupdwln7nyhmc"/>
+    <loader id="n14_jttb" name="StartIndex" xy="134,808" size="159,98"/>
+    <loader id="n22_jttb" name="EndIndex" xy="134,155" size="159,98"/>
   </displayList>
 </component>

+ 2 - 1
FGUIProject/assets/ActivityDay7/components/ButtonDay.xml

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="174,60" extention="Button">
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <controller name="c1" pages="0,选中,1,未选中" selected="0"/>
   <displayList>
     <image id="n0_rle1" name="n0" src="nyhma" fileName="images/choose_cardtab_1.png" xy="0,0">
+      <gearDisplay2 controller="c1" pages="0" condition="0"/>
       <relation target="" sidePair="width-width,height-height"/>
     </image>
     <text id="n1_rle1" name="text" xy="39,8" size="108,44" fontSize="32" color="#954848" autoSize="none" text="第一天"/>

+ 23 - 7
FGUIProject/assets/ActivityDay7/components/ExpProcessItem.xml

@@ -1,11 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="159,98">
+<component size="94,95" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <controller name="c1" pages="0,非最大,1,最大" selected="1"/>
+  <controller name="c2" pages="0,未获得,1,已获得" selected="0"/>
   <displayList>
-    <image id="n5_jttb" name="n5" src="nyhmc" fileName="images/qrhd_wp_db.png" xy="53,0"/>
-    <loader id="n6_jttb" name="loaIcon" xy="74,19" size="58,61" url="ui://eg2y0ldply9g8n"/>
-    <image id="n9_jttb" name="n9" src="nyhm2" fileName="images/qrhd_jd_fgx.png" xy="0,42"/>
-    <image id="n7_jttb" name="n7" src="nyhm9" fileName="images/qrhd_sz_db.png" xy="112,64"/>
-    <text id="n8_jttb" name="Num" xy="112,56" size="47,42" fontSize="28" color="#fffbeb" align="center" vAlign="middle" autoSize="none" text="99"/>
-    <text id="n10_jttb" name="Score" xy="6,41" size="55,42" fontSize="30" color="#fffbeb" autoSize="none" text="100"/>
+    <image id="n11_bhmm" name="n11" src="nyhm4" fileName="images/qrhd_wp_db_1.png" xy="-17,-15" group="n9_bhmm">
+      <gearDisplay controller="c1" pages="1"/>
+    </image>
+    <image id="n3_bhmm" name="bg" src="nyhmc" fileName="images/qrhd_wp_db.png" xy="-1,-2" group="n9_bhmm">
+      <gearDisplay controller="c1" pages="0"/>
+    </image>
+    <loader id="n4_bhmm" name="loaIcon" xy="21,17" size="58,61" group="n9_bhmm" aspect="true" url="ui://eg2y0ldply9g8n" fill="scale"/>
+    <image id="n5_bhmm" name="n5" src="nyhm2" fileName="images/qrhd_jd_fgx.png" xy="-54,40" group="n9_bhmm"/>
+    <image id="n6_bhmm" name="n6" src="nyhm9" fileName="images/qrhd_sz_db.png" xy="58,62" group="n9_bhmm"/>
+    <text id="n7_bhmm" name="Num" xy="58,54" size="47,42" group="n9_bhmm" fontSize="28" color="#fffbeb" align="center" vAlign="middle" autoSize="none" text="99"/>
+    <text id="n8_bhmm" name="Score" xy="-48,39" size="66,42" group="n9_bhmm" fontSize="30" color="#fffbeb" autoSize="none" text="1000"/>
+    <image id="n12_bhmm" name="n12" src="l500tlx" fileName="imagesNew/wpk_zz.png" pkg="eg2y0ldp" xy="-7,-6" group="n9_bhmm">
+      <gearDisplay controller="c2" pages="1"/>
+    </image>
+    <image id="n10_bhmm" name="Get" src="orsttis" fileName="images/pfjl_ywc.png" pkg="eg2y0ldp" xy="10,27" group="n9_bhmm">
+      <gearDisplay controller="c2" pages="1"/>
+    </image>
+    <group id="n9_bhmm" name="n9" xy="-54,-15" size="171,131"/>
   </displayList>
+  <Button/>
 </component>

+ 1 - 1
FGUIProject/assets/ActivityDay7/package.xml

@@ -16,8 +16,8 @@
     <image id="nyhmd" name="qrhd_jf_db.png" path="/images/"/>
     <image id="nyhme" name="qrhd_jdt_sz_db.png" path="/images/"/>
     <component id="nyhmf" name="ExpProcess.xml" path="/components/"/>
-    <component id="nyhmg" name="ExpProcessItem.xml" path="/components/" exported="true"/>
     <component id="rle1h" name="ButtonDay.xml" path="/components/"/>
+    <component id="bhmmi" name="ExpProcessItem.xml" path="/components/" exported="true"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/ActivityDay7" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 2 - 2
FGUIProject/assets/CommonGame/package.xml

@@ -173,7 +173,7 @@
     <component id="si5ztin" name="Button2.xml" path="/components/"/>
     <component id="si5ztio" name="Button3.xml" path="/components/"/>
     <component id="si5ztip" name="Button16.xml" path="/components/" exported="true"/>
-    <image id="orsttis" name="pfjl_ywc.png" path="/images/"/>
+    <image id="orsttis" name="pfjl_ywc.png" path="/images/" exported="true"/>
     <image id="orsttit" name="wpbb_di.png" path="/images/" exported="true"/>
     <image id="pu55tiw" name="pfjl_and.png" path="/images/"/>
     <component id="ng0itiz" name="ComItemIcon.xml" path="/components/"/>
@@ -299,7 +299,7 @@
     <image id="wm603t" name="lm_zhuangshixian_duan.png" path="/imagesNew/" exported="true"/>
     <image id="l500tlv" name="wpk_db_1.png" path="/imagesNew/"/>
     <image id="l500tlw" name="wpk_sz_db.png" path="/imagesNew/"/>
-    <image id="l500tlx" name="wpk_zz.png" path="/imagesNew/"/>
+    <image id="l500tlx" name="wpk_zz.png" path="/imagesNew/" exported="true"/>
     <component id="qik1tly" name="ComItemNew1.xml" path="/components/" exported="true"/>
     <component id="qik1tlz" name="ComItemIconNew1.xml" path="/components/" exported="true"/>
     <image id="hhx9j" name="wp_baseboard1.png" path="/imagesNew/"/>

+ 1 - 0
FGUIProject/assets/Main/MainUI.xml

@@ -14,6 +14,7 @@
       <Button title="福利大厅"/>
     </component>
     <component id="n75_mbf1" name="btnActivityLuckyBox" src="mbf1o4" fileName="components/Button4.xml" xy="18,595" group="n52_qqat"/>
+    <image id="n77_bhmm" name="ActivityDay7" src="q08xe" fileName="images/zjm_renwu.png" xy="29,773" group="n52_qqat"/>
     <component id="n4_q08x" name="btnMain" src="q08xu" fileName="components/ButtonModle1.xml" xy="720,1617" size="310,275" group="n52_qqat">
       <relation target="" sidePair="bottom-bottom"/>
       <Button icon="ui://mfvz4q8kv482fm"/>

+ 1 - 1
FGUIProject/assets/Task/BattlePassRewardUI.xml

@@ -30,7 +30,7 @@
     <text id="n37_nd17" name="n37" xy="198,698" size="132,50" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#bd697a" align="center" autoSize="none" text="普通织造"/>
     <image id="n27_nd17" name="n27" src="uxxstml" fileName="images/bt_db_jlzz.png" xy="405,692"/>
     <image id="n25_nd17" name="n25" src="uxxstmc" fileName="images/txz_jlzz_db_jlzz.png" xy="388,725" size="691,974"/>
-    <text id="n30_nd17" name="n30" xy="667,701" size="132,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#ae7034" align="center" autoSize="none" text="锦罗织造"/>
+    <text id="n30_nd17" name="n30" xy="667,701" size="132,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#ae7034" align="center" autoSize="none" text="特别织造"/>
     <image id="n29_nd17" name="n29" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" pkg="eg2y0ldp" xy="517,714"/>
     <image id="n28_nd17" name="n28" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" pkg="eg2y0ldp" xy="822,714" flip="hz"/>
     <list id="n48_nd17" name="RewardList" xy="2,747" size="1080,790" overflow="scroll" lineGap="10" defaultItem="ui://5mpsibzznd173u"/>

+ 6 - 4
FGUIProject/assets/Task/CombTaskUI.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="1">
+  <controller name="c1" pages="0,,1," selected="0">
     <remark page="0" value="每日任务"/>
     <remark page="1" value="织造任务"/>
   </controller>
@@ -18,13 +18,15 @@
       <item/>
     </list>
     <image id="n21_ids4" name="n21" src="9jv66j" fileName="imagesNew/lm_zsx0.png" pkg="eg2y0ldp" xy="176,883"/>
-    <text id="n22_ids4" name="n22" xy="428,880" size="236,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#915e15" align="center" vAlign="middle" letterSpacing="4" autoSize="none" text="周一5:00刷新"/>
+    <text id="n22_ids4" name="n22" xy="428,880" size="236,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#915e15" align="center" vAlign="middle" letterSpacing="4" autoSize="none" text="每天5:00刷新">
+      <gearText controller="c1" pages="0" values="每天5:00刷新" default="周一5:00刷新"/>
+    </text>
     <image id="n17_ids4" name="n17" src="uxxstm8" fileName="images/yeqian_db.png" xy="302,804" size="491,72"/>
     <component id="n25_ids4" name="n25" src="ids44e" fileName="components/TabButton.xml" xy="294,805" group="n27_ids4">
-      <Button controller="c1" page="0"/>
+      <Button checked="true" controller="c1" page="0"/>
     </component>
     <component id="n26_ids4" name="n26" src="ids44e" fileName="components/TabButton.xml" xy="555,805" group="n27_ids4">
-      <Button checked="true" title="织造任务" controller="c1" page="1"/>
+      <Button title="织造任务" controller="c1" page="1"/>
     </component>
     <group id="n27_ids4" name="n27" xy="294,805" size="522,72" advanced="true" layout="hz" excludeInvisibles="true"/>
     <component id="n18_ids4" name="GetAll" src="rv091o" fileName="components/Button11.xml" pkg="eg2y0ldp" xy="405,1779" size="273,59">

+ 12 - 0
GameClient/Assets/Game/HotUpdate/Data/ActivityDay7DataManager.cs

@@ -8,5 +8,17 @@ namespace GFGGame
         {
             return GameGlobal.myNumericComponent.GetAsInt(NumericType.Day7Activity);
         }
+
+        public long GetScore()
+        {
+            return ItemDataManager.GetItemNum(ConstItemID.BATTLE_PASS_CURRENCY);
+        }
+
+        //NumericType.Day7ActivityReward
+        public bool GetActivityDay7RewardState(int day)
+        {
+            var day7ActivityReward = GameGlobal.myNumericComponent.GetAsInt(NumericType.Day7ActivityReward);
+            return MathHelper.isBitSet(day7ActivityReward, day);
+        }
     }
 }

+ 22 - 1
GameClient/Assets/Game/HotUpdate/Data/TaskDataManager.cs

@@ -89,6 +89,26 @@ namespace GFGGame
         }
 
         /// <summary>
+        /// 获取任务列表
+        /// </summary>
+        /// <returns></returns>
+        public List<TaskCfg> GetTaskCfgs(int[] taskIds)
+        {
+            var cfgs = new List<TaskCfg>();
+            if (taskIds == null) return cfgs;
+            cfgs.AddRange(taskIds.Select(taskId => TaskCfgArray.Instance.GetCfg(taskId)));
+
+            cfgs.Sort((a, b) =>
+            {
+                var stateA = TaskInfosDic[a.id].State == 1 ? 1 : -1;
+                var stateB = TaskInfosDic[b.id].State == 1 ? 1 : -1;
+                if (stateA > stateB) return -1;
+                return stateB > stateA ? 1 : TaskInfosDic[a.id].State.CompareTo(TaskInfosDic[b.id].State);
+            });
+            return cfgs;
+        }
+
+        /// <summary>
         /// 根据任务id获取任务状态
         /// </summary>0未完成,1可领取,2已领取
         /// <param name="taskId"></param>
@@ -126,7 +146,8 @@ namespace GFGGame
                     var cfg = ItemCfgArray.Instance.GetCfg(taskCfg.paramsArr[0]);
                     return string.Format(activeRewardCfg.desc, taskCfg.count, cfg.name);
                 case ConstTaskType.UpgradeCardLvl:
-                case ConstTaskType.PlayLuckBox:
+                case ConstTaskType.UpgradeCardStar:
+                    return string.Format(activeRewardCfg.desc, taskCfg.paramsArr[0], taskCfg.paramsArr[1]);
                 default: return string.Format(activeRewardCfg.desc, taskCfg.count);
             }
         }

+ 3 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityDay7/UI_ButtonDay.cs

@@ -7,6 +7,7 @@ namespace UI.ActivityDay7
     public partial class UI_ButtonDay
     {
         public GButton target;
+        public Controller m_c1;
         public GTextField m_text;
         public const string URL = "ui://kupdwln7rle1h";
         public const string PACKAGE_NAME = "ActivityDay7";
@@ -55,10 +56,12 @@ namespace UI.ActivityDay7
 
         private void Init(GComponent comp)
         {
+            m_c1 = comp.GetController("c1");
             m_text = (GTextField)comp.GetChild("text");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_c1 = null;
             m_text = null;
             if(disposeTarget && target != null)
             {

+ 18 - 6
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityDay7/UI_ExpProcessItem.cs

@@ -6,11 +6,15 @@ namespace UI.ActivityDay7
 {
     public partial class UI_ExpProcessItem
     {
-        public GComponent target;
+        public GButton target;
+        public Controller m_c1;
+        public Controller m_c2;
+        public GImage m_bg;
         public GLoader m_loaIcon;
         public GTextField m_Num;
         public GTextField m_Score;
-        public const string URL = "ui://kupdwln7nyhmg";
+        public GImage m_Get;
+        public const string URL = "ui://kupdwln7bhmmi";
         public const string PACKAGE_NAME = "ActivityDay7";
         public const string RES_NAME = "ExpProcessItem";
         private static UI_ExpProcessItem _proxy;
@@ -19,9 +23,9 @@ namespace UI.ActivityDay7
         {
             var ui = new UI_ExpProcessItem();
             if(gObject == null)
-            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
-            	ui.target =  (GComponent)gObject;
+            	ui.target =  (GButton)gObject;
             ui.Init(ui.target);
             return ui;
         }
@@ -34,9 +38,9 @@ namespace UI.ActivityDay7
             }
             var ui = _proxy;
             if(gObject == null)
-            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
-            	ui.target =  (GComponent)gObject;
+            	ui.target =  (GButton)gObject;
             ui.Init(ui.target);
             return ui;
         }
@@ -57,15 +61,23 @@ namespace UI.ActivityDay7
 
         private void Init(GComponent comp)
         {
+            m_c1 = comp.GetController("c1");
+            m_c2 = comp.GetController("c2");
+            m_bg = (GImage)comp.GetChild("bg");
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
             m_Num = (GTextField)comp.GetChild("Num");
             m_Score = (GTextField)comp.GetChild("Score");
+            m_Get = (GImage)comp.GetChild("Get");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_c1 = null;
+            m_c2 = null;
+            m_bg = null;
             m_loaIcon = null;
             m_Num = null;
             m_Score = null;
+            m_Get = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 3 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_MainUI.cs

@@ -12,6 +12,7 @@ namespace UI.Main
         public UI_Button2 m_btnDailyLogin;
         public UI_Button2 m_btnDailyWelfare;
         public UI_Button4 m_btnActivityLuckyBox;
+        public GImage m_ActivityDay7;
         public UI_ButtonModle1 m_btnMain;
         public UI_ButtonModle1 m_btnHuanZhuang;
         public UI_ButtonModle1 m_btnXiuFang;
@@ -88,6 +89,7 @@ namespace UI.Main
             m_btnDailyLogin = (UI_Button2)UI_Button2.Create(comp.GetChild("btnDailyLogin"));
             m_btnDailyWelfare = (UI_Button2)UI_Button2.Create(comp.GetChild("btnDailyWelfare"));
             m_btnActivityLuckyBox = (UI_Button4)UI_Button4.Create(comp.GetChild("btnActivityLuckyBox"));
+            m_ActivityDay7 = (GImage)comp.GetChild("ActivityDay7");
             m_btnMain = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnMain"));
             m_btnHuanZhuang = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnHuanZhuang"));
             m_btnXiuFang = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnXiuFang"));
@@ -124,6 +126,7 @@ namespace UI.Main
             m_btnDailyWelfare = null;
             m_btnActivityLuckyBox.Dispose();
             m_btnActivityLuckyBox = null;
+            m_ActivityDay7 = null;
             m_btnMain.Dispose();
             m_btnMain = null;
             m_btnHuanZhuang.Dispose();

+ 18 - 0
GameClient/Assets/Game/HotUpdate/ServerProxy/ActivityDay7SProxy.cs

@@ -0,0 +1,18 @@
+using ET;
+using GFGGame;
+
+namespace Game.HotUpdate.ServerProxy
+{
+    public class ActivityDay7SProxy
+    {
+        public static async ETTask<bool> ReqGetActivityDay7Reward(Activity7DaysCfg cfg)
+        {
+            //C2S_GetDay7Reward
+            var response = await MessageHelper.SendToServer(new C2S_GetDay7Reward { Id = cfg.id });
+            if (!(response is { Error: ErrorCode.ERR_Success })) return false;
+            //奖励弹窗
+            BonusController.TryShowBonusList(cfg.bonusArr);
+            return true;
+        }
+    }
+}

+ 3 - 0
GameClient/Assets/Game/HotUpdate/ServerProxy/ActivityDay7SProxy.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 735515dac5fd49bfb3c2fa39763ea920
+timeCreated: 1685620701

+ 68 - 35
GameClient/Assets/Game/HotUpdate/Views/ActivityDay7/ActivityDay7View.cs

@@ -1,5 +1,7 @@
+using System.Collections.Generic;
 using ET;
 using FairyGUI;
+using Game.HotUpdate.ServerProxy;
 using UI.ActivityDay7;
 using UI.CommonGame;
 using UI.Task;
@@ -53,7 +55,16 @@ namespace GFGGame
             base.OnShown();
             onClickDayIndex = ActivityDay7DataManager.Instance.GetActivityDay7Day() - 1;
             SetScoreList();
+            SetScore();
             SetDayList();
+            SetTasks();
+        }
+
+        private void SetScore()
+        {
+            var score = ActivityDay7DataManager.Instance.GetScore();
+            _ui.m_Score.text = score.ToString();
+            _ui.m_ExpProcess.value = score;
         }
 
         protected override void OnHide()
@@ -73,7 +84,7 @@ namespace GFGGame
                 item.target.onClick.Add(OnClickDay);
             }
             //设置按钮状态
-            item.target.selected = index == onClickDayIndex;
+            item.m_c1.selectedIndex = index == onClickDayIndex ? 0 : 1;
             UI_ButtonDay.ProxyEnd();
         }
 
@@ -82,21 +93,33 @@ namespace GFGGame
         {
             if (!(context.sender is GObject typeItem)) return;
             onClickDayIndex = (int)typeItem.data;
-            var activity7DaysTaskCfg = Activity7DaysTaskCfgArray.Instance.GetCfg(onClickDayIndex + 1);
-            _ui.m_TaskList.data = activity7DaysTaskCfg.taskIdArr;
-            _ui.m_TaskList.numItems = activity7DaysTaskCfg.taskIdArr.Length;
+            SetTasks();
             //设置其他按钮选中状态
             SetDayList();
+            FreshGetStatus();
+        }
+
+        private void SetTasks()
+        {
+            var activity7DaysTaskCfg = Activity7DaysTaskCfgArray.Instance.GetCfg(onClickDayIndex + 1);
+            var taskIdArr = activity7DaysTaskCfg.taskIdArr;
+            //排序根据领取状态
+            var taskCfgs = TaskDataManager.Instance.GetTaskCfgs(taskIdArr);
+            _ui.m_TaskList.data = taskCfgs;
+            _ui.m_TaskList.numItems = taskIdArr.Length;
+            if (_ui.m_TaskList.numItems > 0)
+            {
+                _ui.m_TaskList.ScrollToView(0);
+            }
         }
 
         //TaskListRenderer
         private void TaskListRenderer(int index, GObject obj)
         {
             var item = UI_TaskListItem.Proxy(obj);
-            var tasks = (int[])obj.parent.data;
-            var taskId = tasks[index];
-            var taskCfg = TaskCfgArray.Instance.GetCfg(taskId);
-            item.m_c1.selectedIndex = TaskDataManager.Instance.GetTaskStateById(taskId);
+            var tasks = (TaskCfg[])obj.parent.data;
+            var taskCfg = tasks[index];
+            item.m_c1.selectedIndex = TaskDataManager.Instance.GetTaskStateById(taskCfg.id);
             item.m_c2.selectedIndex = taskCfg.jumpId == "" ? 1 : 0;
             item.m_txtDesc.text = TaskDataManager.Instance.GetTaskDesc(taskCfg.id);
             item.m_txtCount.text =
@@ -122,12 +145,8 @@ namespace GFGGame
 
         private static void ListTaskRewardItemRender(int index, GObject obj)
         {
-            var item = UI_RewardIconYellow.Proxy(obj);
-            var rewards = (int[][])item.target.parent.data;
-            var itemCfg = ItemCfgArray.Instance.GetCfg(rewards[index][0]);
-            item.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(itemCfg.res);
-            item.m_num.text = $"{rewards[index][1]}";
-            UI_RewardIconYellow.ProxyEnd();
+            var rewards = (int[][])obj.parent.data;
+            ItemUtil.CreateItemView(rewards[index], obj as GComponent);
         }
 
         private void OnBtnGoClick(EventContext context)
@@ -139,21 +158,26 @@ namespace GFGGame
                 true);
         }
 
+        private List<GComponent> components = new List<GComponent>();
+
         //设置积分列表
         private void SetScoreList()
         {
             //7日活动配置
             activity7DaysCfgs = Activity7DaysCfgArray.Instance.dataArray;
             var maxCfg = activity7DaysCfgs[activity7DaysCfgs.Length - 1];
+            var maxCfgID = maxCfg.id;
             var maxScore = maxCfg.score;
             var pos = _ui.m_StartIndex.position;
             var endY = _ui.m_EndIndex.position.y;
+            _ui.m_ExpProcess.max = maxScore;
             //循环设置UI
             foreach (var cfg in activity7DaysCfgs)
             {
                 var cfgScore = cfg.score;
                 var item = UI_ExpProcessItem.Create();
                 var target = item.target;
+                components.Add(target);
                 _ui.target.AddChild(target);
                 // 根据 maxScore  cfgScore pos.y endY 设置target 位置 x,z不变,y根据比例设置 
                 var y = pos.y - (pos.y - endY) * cfgScore / maxScore;
@@ -161,13 +185,15 @@ namespace GFGGame
                 item.m_Score.text = cfgScore.ToString();
                 var cfgBonusArr = cfg.bonusArr;
                 var itemCfg = ItemCfgArray.Instance.GetCfg(cfgBonusArr[0][0]);
-                item.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(itemCfg.res);
+                item.m_loaIcon.url = string.IsNullOrEmpty(itemCfg.res) ? "" : ResPathUtil.GetIconPath(itemCfg);
                 item.m_Num.text = cfgBonusArr[0][1].ToString();
+                item.m_c1.selectedIndex = cfg.id == maxCfgID ? 1 : 0;
+                item.target.data = cfg;
+                item.target.onClick.Add(OnClickReward);
                 UI_ExpProcess.ProxyEnd();
             }
         }
 
-
         //设置天数列表
         private void SetDayList()
         {
@@ -176,35 +202,42 @@ namespace GFGGame
             _ui.m_DayList.numItems = cfgDataArray.Length;
         }
 
+        private void FreshGetStatus()
+        {
+            components.ForEach(com =>
+            {
+                var item = UI_ExpProcessItem.Create(com);
+                var cfg = (Activity7DaysCfg)item.target.data;
+                var cfgID = cfg.id;
+                var state = ActivityDay7DataManager.Instance.GetActivityDay7RewardState(cfgID);
+                item.m_c2.selectedIndex = state ? 1 : 0;
+            });
+        }
+
         private async void OnBtnGetClick(EventContext context)
         {
             if (!(context.sender is GObject btnGet)) return;
             var result = await TaskSProxy.GetTaskBonus((int)btnGet.data);
             if (!result) return;
+            SetTasks();
         }
 
 
-        private async ETTask OnClickReward(int id)
+        private async void OnClickReward(EventContext context)
         {
-            var cfg = DailyActiveRewardCfgArray.Instance.GetCfg(id);
-            var state = DailyTaskDataManager.Instance.GetBoxStateById(cfg.id);
-            switch (state)
+            if (!(context.sender is GObject btnGet)) return;
+            var activity7DaysCfg = (Activity7DaysCfg)btnGet.data;
+            var id = activity7DaysCfg.id;
+            var get = ActivityDay7DataManager.Instance.GetActivityDay7RewardState(id);
+            if (get)
+            {
+                ViewManager.Show<RewardPreView>(new object[] { "已领取过了" });
+            }
+            else
             {
-                case ConstBonusStatus.CAN_NOT_GET:
-                {
-                    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;
-                }
-                case ConstBonusStatus.GOT:
-                    //领取完毕
-                    break;
+                var result = await ActivityDay7SProxy.ReqGetActivityDay7Reward(activity7DaysCfg);
+                if (!result) return;
+                FreshGetStatus();
             }
         }
     }

+ 146 - 80
GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -32,6 +32,8 @@ namespace GFGGame
         private GButton _btnField;
         private GButton _btnBag;
 
+        private GButton _btnActivityDay7;
+
 
         private GameObject _effectObj4;
         private GoWrapper _wrapper4;
@@ -52,11 +54,11 @@ namespace GFGGame
         private List<GameObject> _effects1 = new List<GameObject>();
         private List<GoWrapper> _wrappers1 = new List<GoWrapper>();
         private UI_ButtonModle1[] _btns;
+
         public override void Dispose()
         {
             if (_valueBarController != null)
             {
-
                 _valueBarController.Dispose();
                 _valueBarController = null;
             }
@@ -92,7 +94,6 @@ namespace GFGGame
             viewCom = _ui.target;
             isfullScreen = true;
             _scenePrefab = GFGAsset.Load<GameObject>(ResPathUtil.GetPrefabPath("SceneMain"));
-
         }
 
         protected override void OnInit()
@@ -114,6 +115,8 @@ namespace GFGGame
             // _btnStudio = _ui.m_list.GetChild("btnStudio").asButton;
             // _btnField = _ui.m_list.GetChild("btnField").asButton;
             _btnBag = _ui.m_list.GetChild("btnBag").asButton;
+            
+            _btnActivityDay7 = _ui.m_ActivityDay7.asButton;
 
             // _btnGongGao.visible = false;
             // _btnHaoYou.visible = false;
@@ -144,6 +147,7 @@ namespace GFGGame
             _btnHaoYou.onClick.Add(OnClickBtnHaoYou);
             _btnGongGao.onClick.Add(OnClickBtnGongGao);
             _btnRenWu.onClick.Add(OnClickBtnRenWu);
+            _btnActivityDay7.onClick.Add(OnClickBtnDay7);
             // _btnStudio.onClick.Add(OnClickBtnStudio);
             // _btnField.onClick.Add(OnClickBtnField);
             _btnBag.onClick.Add(OnClickBtnBag);
@@ -164,6 +168,7 @@ namespace GFGGame
             // StorageSProxy.ReqSetClientValue(ConstStorageId.STORAGE_GUIDE + cfg.id, 1).Coroutine();
             AddEffect();
         }
+
         protected override void AddEventListener()
         {
             base.AddEventListener();
@@ -172,6 +177,7 @@ namespace GFGGame
             EventAgent.AddEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
             EventAgent.AddEventListener(ConstMessage.CHANGE_ROLE_HEAD, UpdateHead);
         }
+
         protected override void OnShown()
         {
             base.OnShown();
@@ -194,8 +200,11 @@ namespace GFGGame
             _valueBarController.OnShown();
 
 
-            long lastTime = GameGlobal.lastLoginTime;// GameGlobal.myNumericComponent.GetAsInt(NumericType.OnlineTimeSecs);
-            if (!TimeUtil.CheckIsSameTime(lastTime * 1000, TimeHelper.ClientNow()) && ActivityDataManager.Instance.sevenDayLoginBonusStatus == ConstBonusStatus.CAN_GET && GuideDataManager.currentGuideId <= 0)
+            long lastTime =
+                GameGlobal.lastLoginTime; // GameGlobal.myNumericComponent.GetAsInt(NumericType.OnlineTimeSecs);
+            if (!TimeUtil.CheckIsSameTime(lastTime * 1000, TimeHelper.ClientNow()) &&
+                ActivityDataManager.Instance.sevenDayLoginBonusStatus == ConstBonusStatus.CAN_GET &&
+                GuideDataManager.currentGuideId <= 0)
             {
                 ViewManager.Show<SevenDayLoginView>();
                 GameGlobal.lastLoginTime = GameGlobal.myNumericComponent.GetAsInt(NumericType.OnlineTimeSecs);
@@ -217,6 +226,7 @@ namespace GFGGame
             Timers.inst.Remove(Update);
             Timers.inst.Remove(CheckGuide);
         }
+
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
@@ -224,8 +234,8 @@ namespace GFGGame
             EventAgent.RemoveEventListener(ConstMessage.STORY_LEVEL_CHANGE, CheckFunOpen);
             EventAgent.RemoveEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
             EventAgent.RemoveEventListener(ConstMessage.CHANGE_ROLE_HEAD, UpdateHead);
-
         }
+
         private void AddEffect()
         {
             // string resPath0 = ResPathUtil.GetViewEffectPath("ui_zjm", "ui_xf_tx");
@@ -246,13 +256,16 @@ namespace GFGGame
 
             string resPath1 = ResPathUtil.GetViewEffectPath("ui_zjm", "ui_zjm_zzl_d");
             string resPath3 = ResPathUtil.GetViewEffectPath("ui_zjm", "ui_zjm_zzl");
-            SceneController.AddObjectToView(_effectObj4, _wrapper4, _ui.m_btnMain.m_holder, resPath1, out _effectObj4, out _wrapper4);
-            SceneController.AddObjectToView(_effectObj4_1, _wrapper4_1, _ui.m_btnMain.m_holder1, resPath3, out _effectObj4_1, out _wrapper4_1);
+            SceneController.AddObjectToView(_effectObj4, _wrapper4, _ui.m_btnMain.m_holder, resPath1, out _effectObj4,
+                out _wrapper4);
+            SceneController.AddObjectToView(_effectObj4_1, _wrapper4_1, _ui.m_btnMain.m_holder1, resPath3,
+                out _effectObj4_1, out _wrapper4_1);
 
             string resPath4 = ResPathUtil.GetViewEffectPath("ui_zjm", "ui_zjm_jt");
-            SceneController.AddObjectToView(_effectObj6, _wrapper6, _ui.m_loaLeft.m_holder, resPath4, out _effectObj6, out _wrapper6);
-            SceneController.AddObjectToView(_effectObj7, _wrapper7, _ui.m_loaRight.m_holder, resPath4, out _effectObj7, out _wrapper7);
-
+            SceneController.AddObjectToView(_effectObj6, _wrapper6, _ui.m_loaLeft.m_holder, resPath4, out _effectObj6,
+                out _wrapper6);
+            SceneController.AddObjectToView(_effectObj7, _wrapper7, _ui.m_loaRight.m_holder, resPath4, out _effectObj7,
+                out _wrapper7);
 
 
             // string resPath2 = ResPathUtil.GetViewEffectPath("ui_zjm", "ui_zjm_tx");
@@ -269,7 +282,8 @@ namespace GFGGame
                 Scene.SetActive(true);
                 Bg.SetActive(true);
                 Bg1.SetActive(false);
-                _ui.m_t3.Play(); ;
+                _ui.m_t3.Play();
+                ;
             }
             else if (MainDataManager.Instance.ViewType == 1)
             {
@@ -280,21 +294,25 @@ namespace GFGGame
                 // _sceneObject.transform.position = new Vector2(-GRoot.inst.width / 100f, 0);
             }
         }
+
         private void OnSwipe(EventContext context)
         {
             if (!MainDataManager.Instance.CanSwipe) return;
             if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(ConstFunctionId.MAIN_SECOND_VIEW, false)) return;
 
             SwipeGesture swipeture = (SwipeGesture)context.sender;
-            if (MainDataManager.Instance.ViewType == 0 && swipeture.position.x < 0 && swipeture.position.y < -swipeture.position.x && swipeture.position.y > swipeture.position.x)
+            if (MainDataManager.Instance.ViewType == 0 && swipeture.position.x < 0 &&
+                swipeture.position.y < -swipeture.position.x && swipeture.position.y > swipeture.position.x)
             {
                 MoveLeft();
             }
-            else if (MainDataManager.Instance.ViewType == 1 && swipeture.position.x > 0 && swipeture.position.y > -swipeture.position.x && swipeture.position.y < swipeture.position.x)
+            else if (MainDataManager.Instance.ViewType == 1 && swipeture.position.x > 0 &&
+                     swipeture.position.y > -swipeture.position.x && swipeture.position.y < swipeture.position.x)
             {
                 MoveRight();
             }
         }
+
         private void MoveLeft()
         {
             _ui.target.touchable = false;
@@ -307,15 +325,16 @@ namespace GFGGame
                 MainDataManager.Instance.ViewType = 1;
             });
         }
+
         private void ChangeSceneBg(object param)
         {
             _sceneObject.transform.Find("Scene").gameObject.SetActive(false);
             _sceneObject.transform.Find("Bg").gameObject.SetActive(false);
             _sceneObject.transform.Find("Bg1").gameObject.SetActive(true);
         }
+
         private void MoveRight()
         {
-
             _ui.target.touchable = false;
             Timers.inst.Add(0.5f, 1, ChangeSceneBg1);
             _ui.m_t2.Play(() =>
@@ -324,12 +343,14 @@ namespace GFGGame
                 MainDataManager.Instance.ViewType = 0;
             });
         }
+
         private void ChangeSceneBg1(object param)
         {
             _sceneObject.transform.Find("Scene").gameObject.SetActive(true);
             _sceneObject.transform.Find("Bg").gameObject.SetActive(true);
             _sceneObject.transform.Find("Bg1").gameObject.SetActive(false);
         }
+
         private void OnBtnChangClick()
         {
             int count = 0;
@@ -344,10 +365,7 @@ namespace GFGGame
                 _ui.m_btnChange.m_c1.selectedIndex = 1;
 
                 GTween.To(_ui.m_list.height, height, 0.4f).SetTarget(_ui.m_list)
-                .OnUpdate((GTweener t) =>
-                {
-                    _ui.m_list.height = t.value.x;
-                }).SetEase(EaseType.QuintInOut);
+                    .OnUpdate((GTweener t) => { _ui.m_list.height = t.value.x; }).SetEase(EaseType.QuintInOut);
                 // _ui.m_list.ResizeToFit();
                 // _ui.m_btnChange.m_c1.selectedIndex = 1;
             }
@@ -356,14 +374,12 @@ namespace GFGGame
                 _ui.m_btnChange.m_c1.selectedIndex = 0;
 
                 GTween.To(_ui.m_list.height, oneItemHeight, 0.4f).SetTarget(_ui.m_list)
-                .OnUpdate((GTweener t) =>
-                {
-                    _ui.m_list.height = t.value.x;
-                }).SetEase(EaseType.QuintInOut);
+                    .OnUpdate((GTweener t) => { _ui.m_list.height = t.value.x; }).SetEase(EaseType.QuintInOut);
                 // _ui.m_list.height = 0;
                 // _ui.m_btnChange.m_c1.selectedIndex = 0;
             }
         }
+
         private void OnClickBtnMain()
         {
             LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.CHUN_ZHONG_LOU, 1);
@@ -374,8 +390,10 @@ namespace GFGGame
             // {
             // _ui.m_btnMain.m_holder1.visible = false;
             // this.Hide();
-            ViewManager.Show(ViewName.STORY_CHAPTER_LIST_VIEW, null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
-            isOpen = false; ;
+            ViewManager.Show(ViewName.STORY_CHAPTER_LIST_VIEW, null,
+                new object[] { ViewName.MAINUI_VIEW, this.viewData });
+            isOpen = false;
+            ;
 
 
             // });
@@ -430,6 +448,7 @@ namespace GFGGame
 
             // });
         }
+
         private void OnClickBtnDailyLogin()
         {
             // if (isOpen) return;
@@ -447,8 +466,8 @@ namespace GFGGame
             ViewManager.Show<SevenDayLoginView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
             //     isOpen = false;
             // });
-
         }
+
         private void OnClickBtnDailyWelfare()
         {
             // if (isOpen) return;
@@ -466,12 +485,14 @@ namespace GFGGame
             ViewManager.Show<DailyWelfareView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
             //     isOpen = false;
             // });
-
         }
+
         private void OnClickBtnActivityLuckyBox()
         {
-            ViewManager.Show<ActivityThemeLuckyBoxView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData }, true);
+            ViewManager.Show<ActivityThemeLuckyBoxView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData },
+                true);
         }
+
         private void OnClickBtnCiPai()
         {
             LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.CI_PAI, 1);
@@ -494,18 +515,21 @@ namespace GFGGame
         {
             ViewManager.Show<StudioView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
         }
+
         private void OnClickBtnField()
         {
             LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.TIAN_YE_DIAO_CHA, 1);
 
             ViewManager.Show<FieldView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
         }
+
         private void OnClickBtnPoem()
         {
             // LogServerHelper.SendNodeLog((int)PlayParticipationEnum.TIAN_YE_DIAO_CHA, 1);
 
             ViewManager.Show<PoemView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
         }
+
         private void OnClickBtnArena()
         {
             // LogServerHelper.SendNodeLog((int)PlayParticipationEnum.TIAN_YE_DIAO_CHA, 1);
@@ -520,12 +544,14 @@ namespace GFGGame
                 ViewManager.Show<ArenaLoadingView>();
             }
         }
+
         private void OnClickBtnTravel()
         {
             // LogServerHelper.SendNodeLog((int)PlayParticipationEnum.TIAN_YE_DIAO_CHA, 1);
 
             ViewManager.Show<TravelView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
         }
+
         private void OnClickBtnBag()
         {
             ViewManager.Show<BagView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
@@ -540,15 +566,16 @@ namespace GFGGame
             //     PromptController.Instance.ShowFloatTextPrompt("数据来的有点慢,稍后再试下吧");
             //     return;
             // }
-            if (LeagueDataManager.Instance.Type == 1)//已加入联盟
+            if (LeagueDataManager.Instance.Type == 1) //已加入联盟
             {
                 ViewManager.Show<LeagueView>();
             }
-            else//未加入联盟
+            else //未加入联盟
             {
                 ViewManager.Show<LeagueJoinView>();
             }
         }
+
         private void OnClickBtnStore()
         {
             LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.SHANG_CHENG, 1);
@@ -562,20 +589,23 @@ namespace GFGGame
 
             ViewManager.Show(ViewName.FIELD_GUIDE_VIEW, null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
         }
+
         private void OnClickBtnYouJian()
         {
             ViewManager.Show<MailView>();
         }
+
         private void OnClickBtnHaoYou()
         {
-
             ViewManager.Show<FriendView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData }, true);
         }
+
         private void OnClickBtnGongGao()
         {
             // /null, new object[] { ViewName.MAINUI_VIEW, this.viewData }
             ViewManager.Show<NoticeView>();
         }
+
         private void OnClickBtnRenWu()
         {
             ViewManager.Show<TaskView>(null, new[] { ViewName.MAINUI_VIEW, this.viewData });
@@ -583,17 +613,23 @@ namespace GFGGame
             // LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.MEI_RI_REN_WU, 1);
             // ViewManager.Show<DailyTaskView>();
         }
+
+        private void OnClickBtnDay7()
+        {
+            ViewManager.Show<ActivityDay7View>(null, new[] { ViewName.MAINUI_VIEW, this.viewData });
+        }
+        
         private void OnClickHeadBar()
         {
             ViewManager.Show(ViewName.ROLE_INFO_VIEW);
         }
 
 
-
         private void Update(object param)
         {
             ShowExitAlert();
-            int activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.LimitLuckyBox);
+            int activityId =
+                ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.LimitLuckyBox);
             _ui.m_btnActivityLuckyBox.target.visible = activityId > 0;
             if (activityId > 0)
             {
@@ -603,21 +639,22 @@ namespace GFGGame
                     _luckyBoxActivtyId = activityId;
                 }
                 ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(activityId);
-                _ui.m_btnActivityLuckyBox.target.title = TimeUtil.FormattingTimeTo_DDHHmm(TimeUtil.DateTimeToTimestamp(activityOpenCfg.endTime) - TimeHelper.ServerNow());
+                _ui.m_btnActivityLuckyBox.target.title =
+                    TimeUtil.FormattingTimeTo_DDHHmm(TimeUtil.DateTimeToTimestamp(activityOpenCfg.endTime) -
+                                                     TimeHelper.ServerNow());
             }
         }
+
         private void ShowExitAlert()
         {
             if (Input.GetKeyDown(KeyCode.Escape) || Input.GetKeyDown(KeyCode.Home))
             {
                 AlertSystem.Show("我会想你的")
-                .SetLeftButton(true, "继续游戏")
-                .SetRightButton(true, "退出游戏", (object data) =>
-                {
-                    Application.Quit();
-                });
+                    .SetLeftButton(true, "继续游戏")
+                    .SetRightButton(true, "退出游戏", (object data) => { Application.Quit(); });
             }
         }
+
         private void OnNumericChange(EventContext context)
         {
             if ((int)context.data == NumericType.Lvl)
@@ -626,6 +663,7 @@ namespace GFGGame
                 CheckFunOpen();
             }
         }
+
         private void UpdateRoleLvl()
         {
             _ui.m_headBar.m_txtLvl.text = "" + GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl);
@@ -633,49 +671,70 @@ namespace GFGGame
 
         private void UpdateHead()
         {
-            RoleInfoManager.Instance.UpdateHead(_ui.m_headBar.m_comHead, RoleDataManager.headId, RoleDataManager.headBorderId);
+            RoleInfoManager.Instance.UpdateHead(_ui.m_headBar.m_comHead, RoleDataManager.headId,
+                RoleDataManager.headBorderId);
         }
 
         private void CheckFunOpen()
         {
-            _ui.m_btnXiuFang.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(XiuFangView).Name, false);
-            _ui.m_btnHuanZhuang.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(DressUpView).Name, false);
-            _ui.m_btnCiPai.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(CardDetailView).Name, false);
-            _ui.m_btnZhaiXing.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(LuckyBoxView).Name, false);
-            _ui.m_btnMain.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StoryChapterListView).Name, false);
-            _ui.m_btnStudio.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StudioView).Name, false);
-            _ui.m_btnField.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(FieldView).Name, false);
-            _ui.m_btnPoem.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(PoemView).Name, false);
-            _ui.m_btnTravel.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(TravelView).Name, false);
-            _ui.m_btnArena.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(ArenaView).Name, false);
-            _ui.m_btnActivityLuckyBox.target.visible = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.LimitLuckyBox) > 0;
-
-            _ui.m_btnDailyLogin.target.visible = !(!FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(SevenDayLoginView).Name, false)
-            || (ActivityDataManager.Instance.sevenDayLoginLoginId >= 7 && ActivityDataManager.Instance.sevenDayLoginBonusStatus == ConstBonusStatus.GOT));
-            _ui.m_btnDailyWelfare.target.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(DailyWelfareView).Name, false);
+            _ui.m_btnXiuFang.m_loaLockIcon.visible =
+                !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(XiuFangView).Name, false);
+            _ui.m_btnHuanZhuang.m_loaLockIcon.visible =
+                !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(DressUpView).Name, false);
+            _ui.m_btnCiPai.m_loaLockIcon.visible =
+                !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(CardDetailView).Name, false);
+            _ui.m_btnZhaiXing.m_loaLockIcon.visible =
+                !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(LuckyBoxView).Name, false);
+            _ui.m_btnMain.m_loaLockIcon.visible =
+                !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StoryChapterListView).Name, false);
+            _ui.m_btnStudio.m_loaLockIcon.visible =
+                !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StudioView).Name, false);
+            _ui.m_btnField.m_loaLockIcon.visible =
+                !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(FieldView).Name, false);
+            _ui.m_btnPoem.m_loaLockIcon.visible =
+                !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(PoemView).Name, false);
+            _ui.m_btnTravel.m_loaLockIcon.visible =
+                !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(TravelView).Name, false);
+            _ui.m_btnArena.m_loaLockIcon.visible =
+                !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(ArenaView).Name, false);
+            _ui.m_btnActivityLuckyBox.target.visible =
+                ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.LimitLuckyBox) > 0;
+
+            _ui.m_btnDailyLogin.target.visible =
+                !(!FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(SevenDayLoginView).Name, false)
+                  || (ActivityDataManager.Instance.sevenDayLoginLoginId >= 7 &&
+                      ActivityDataManager.Instance.sevenDayLoginBonusStatus == ConstBonusStatus.GOT));
+            _ui.m_btnDailyWelfare.target.visible =
+                FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(DailyWelfareView).Name, false);
 
             _btnGongGao.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(NoticeView).Name, false);
             _btnHaoYou.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(FriendView).Name, false);
             _btnYouJian.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(MailView).Name, false);
             _btnLeague.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(LeagueView).Name, false);
             _btnStore.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StoreView).Name, false);
-            _btnTuJian.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(FieldGuideView).Name, false);
-
+            _btnTuJian.visible =
+                FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(FieldGuideView).Name, false);
         }
+
         private void UpdateRedDot()
         {
             RedDotController.Instance.SetComRedDot(_btnGongGao, RedDotDataManager.Instance.GetNoticeRed());
             RedDotController.Instance.SetComRedDot(_btnRenWu, RedDotDataManager.Instance.GetTaskRed());
-            RedDotController.Instance.SetComRedDot(_ui.m_btnDailyLogin.target, RedDotDataManager.Instance.GetDailyLoginRed());
+            RedDotController.Instance.SetComRedDot(_ui.m_btnDailyLogin.target,
+                RedDotDataManager.Instance.GetDailyLoginRed());
             RedDotController.Instance.SetComRedDot(_btnYouJian, RedDotDataManager.Instance.GetMailRed());
-            RedDotController.Instance.SetComRedDot(_btnTuJian, RedDotDataManager.Instance.GetFieldGuideRed() || RedDotDataManager.Instance.GetTravelGuideRed());
+            RedDotController.Instance.SetComRedDot(_btnTuJian,
+                RedDotDataManager.Instance.GetFieldGuideRed() || RedDotDataManager.Instance.GetTravelGuideRed());
             RedDotController.Instance.SetComRedDot(_btnHaoYou, RedDotDataManager.Instance.GetFriendRed());
             RedDotController.Instance.SetComRedDot(_btnStore, RedDotDataManager.Instance.GetChargeAddUpReward());
-            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);
-            RedDotController.Instance.SetComRedDot(_ui.m_btnTravel.target, RedDotDataManager.Instance.GetTravelRed(), "", -38);
-
+            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);
+            RedDotController.Instance.SetComRedDot(_ui.m_btnTravel.target, RedDotDataManager.Instance.GetTravelRed(),
+                "", -38);
         }
 
         private void CheckGuide(object param)
@@ -683,14 +742,14 @@ namespace GFGGame
             MainDataManager.Instance.CanSwipe = true;
             GRoot.inst.touchable = true;
             if (GuideDataManager.IsGuideFinish(ConstGuideId.FREEDOM_DRESS) <= 0
-            || GuideDataManager.IsGuideFinish(ConstGuideId.CLOTHING_DECOMPOSE) <= 0
-            || GuideDataManager.IsGuideFinish(ConstGuideId.CLOTHING_SYNTHETIC) <= 0
-            || GuideDataManager.IsGuideFinish(ConstGuideId.UP_CARD_LV) <= 0
-             || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER) <= 0
-             || GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_FILING) <= 0
-             || GuideDataManager.IsGuideFinish(ConstGuideId.FIELD) <= 0
-             || GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_METAL) <= 0
-            || GuideDataManager.IsGuideFinish(ConstGuideId.SUIT_LIST_VIEW) <= 0)
+                || GuideDataManager.IsGuideFinish(ConstGuideId.CLOTHING_DECOMPOSE) <= 0
+                || GuideDataManager.IsGuideFinish(ConstGuideId.CLOTHING_SYNTHETIC) <= 0
+                || GuideDataManager.IsGuideFinish(ConstGuideId.UP_CARD_LV) <= 0
+                || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER) <= 0
+                || GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_FILING) <= 0
+                || GuideDataManager.IsGuideFinish(ConstGuideId.FIELD) <= 0
+                || GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_METAL) <= 0
+                || GuideDataManager.IsGuideFinish(ConstGuideId.SUIT_LIST_VIEW) <= 0)
             {
                 UpdateToCheckGuide(null);
             }
@@ -706,21 +765,29 @@ namespace GFGGame
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
             if (MainDataManager.Instance.ViewType == 0)
             {
-                GuideController.TryGuide(_ui.m_btnHuanZhuang.target, ConstGuideId.FREEDOM_DRESS, 2, "在这里,自由搭配服饰和分享哦~", -1, false);
-                GuideController.TryGuide(_ui.m_btnMain.target, ConstGuideId.ENTER_CHAPTER, 3, "海市蜃楼,镜花水月,是所有故事开始的地方。", -1, false);
+                GuideController.TryGuide(_ui.m_btnHuanZhuang.target, ConstGuideId.FREEDOM_DRESS, 2, "在这里,自由搭配服饰和分享哦~",
+                    -1, false);
+                GuideController.TryGuide(_ui.m_btnMain.target, ConstGuideId.ENTER_CHAPTER, 3, "海市蜃楼,镜花水月,是所有故事开始的地方。",
+                    -1, false);
 
-                GuideController.TryGuide(_ui.m_btnXiuFang.target, ConstGuideId.CLOTHING_DECOMPOSE, 2, "绣坊里增添了新功能。", -1, false);
+                GuideController.TryGuide(_ui.m_btnXiuFang.target, ConstGuideId.CLOTHING_DECOMPOSE, 2, "绣坊里增添了新功能。", -1,
+                    false);
 
-                GuideController.TryGuide(_ui.m_btnXiuFang.target, ConstGuideId.CLOTHING_SYNTHETIC, 1, "进入绣坊界面。", -1, false);
+                GuideController.TryGuide(_ui.m_btnXiuFang.target, ConstGuideId.CLOTHING_SYNTHETIC, 1, "进入绣坊界面。", -1,
+                    false);
                 GuideController.TryCompleteGuide(ConstGuideId.CLOTHING_SYNTHETIC, 7);
 
                 GuideController.TryGuide(_ui.m_btnCiPai.target, ConstGuideId.UP_CARD_LV, 2, "“词牌”可进行升级和管理。", -1, false);
 
-                GuideController.TryGuide(_ui.m_btnXiuFang.target, ConstGuideId.SUIT_LIST_VIEW, 1, "获得“天衣”服饰后,可进行养护和焕新,到绣坊看看。");
+                GuideController.TryGuide(_ui.m_btnXiuFang.target, ConstGuideId.SUIT_LIST_VIEW, 1,
+                    "获得“天衣”服饰后,可进行养护和焕新,到绣坊看看。");
 
-                bool isStudioMetalGuide = GuideController.TryGuide(null, ConstGuideId.STUDIO_METAL, 2, "向左滑动界面。", -1, false, _ui.target.height - 700);
-                bool isStudioFilingGuide = GuideController.TryGuide(null, ConstGuideId.STUDIO_FILING, 2, "向左滑动界面。", -1, false, _ui.target.height - 700);
-                bool isFieldGuide = GuideController.TryGuide(null, ConstGuideId.FIELD, 1, "向左滑动界面。", -1, false, _ui.target.height - 700);
+                bool isStudioMetalGuide = GuideController.TryGuide(null, ConstGuideId.STUDIO_METAL, 2, "向左滑动界面。", -1,
+                    false, _ui.target.height - 700);
+                bool isStudioFilingGuide = GuideController.TryGuide(null, ConstGuideId.STUDIO_FILING, 2, "向左滑动界面。", -1,
+                    false, _ui.target.height - 700);
+                bool isFieldGuide = GuideController.TryGuide(null, ConstGuideId.FIELD, 1, "向左滑动界面。", -1, false,
+                    _ui.target.height - 700);
 
                 if (isStudioMetalGuide || isStudioFilingGuide || isFieldGuide)
                 {
@@ -739,7 +806,6 @@ namespace GFGGame
                 GuideController.TryGuide(_ui.m_btnStudio.target, ConstGuideId.STUDIO_FILING, 3, "工作室有新的任务啦。");
                 GuideController.TryGuide(_ui.m_btnField.target, ConstGuideId.FIELD, 2, "外出进行历史考察,会有意想不到的收获哦。");
             }
-
         }
     }
 }

+ 1 - 2
GameClient/Assets/Game/HotUpdate/Views/Task/BattlePassTaskView.cs

@@ -37,8 +37,7 @@ namespace GFGGame
             _ui.m_RewardList.SetVirtual();
             _ui.m_SpecialReward.m_RewardList.itemRenderer = SpecialRewardRender;
             _ui.m_tip.onClick.Add(RuleController.ShowRuleView);
-            //TODO 替换成新加的
-            _ui.m_tip.data = 300002;
+            _ui.m_tip.data = 300012;
         }
 
         protected override void OnHide()

+ 0 - 1
GameClient/Assets/Game/HotUpdate/Views/Task/BuyBattlePassLevelView.cs

@@ -1,5 +1,4 @@
 using FairyGUI;
-using UI.CommonGame;
 using UI.Task;
 
 namespace GFGGame

BIN
GameClient/Assets/ResIn/UI/ActivityDay7/ActivityDay7_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/ActivityDay7/ActivityDay7_atlas0.png


BIN
GameClient/Assets/ResIn/UI/ActivityDay7/ActivityDay7_fui.bytes


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_fui.bytes


BIN
GameClient/Assets/ResIn/UI/Task/Task_fui.bytes