新手禮包，七日簽到

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

@@ -216,6 +216,9 @@ namespace GFGGame
 
             await ShopSProxy.ReqShopInfo();
 
+            await ActivitySProxy.ReqGetNewPlayerBonusStatus();
+            await ActivitySProxy.GetNewPlayerOnceStatus();
+
             FieldDataManager.Instance.waitToShowFieldFightEndView = false;
             bool result = await FieldSProxy.ReqFieldInstanceInfos();
             if (result && FieldDataManager.Instance.fieldInfos.hasBonus)
@@ -229,11 +232,10 @@ namespace GFGGame
             GameGlobal.AfterDataInited = true;
             EventAgent.DispatchEvent(ConstMessage.AFTER_DATA_INITED);
 
-
-
             ItemProxy.GetItemAttributeInfos().Coroutine();
             ItemProxy.ReqGetItemCollect().Coroutine();
             MainStorySProxy.GetStoryBonusInfos().Coroutine();
+            MainStorySProxy.GetStoryBonusDate().Coroutine();
             CardSProxy.GetCardInfos().Coroutine();
             TaskSProxy.GetTaskInfos();
             BattlePassTaskSProxy.GetBattlePassInfo().Coroutine();     
@@ -267,8 +269,6 @@ namespace GFGGame
             LeagueSproxy.GetTeapartyInfos().Coroutine();
             LeagueSproxy.GetTeapartyMatchingInfos(RoleDataManager.roleId).Coroutine();
             ActivitySProxy.ReqGetActivitySignInfos().Coroutine();
-            ActivitySProxy.ReqGetNewPlayerBonusStatus().Coroutine();
-            ActivitySProxy.GetNewPlayerOnceStatus().Coroutine();
 
             int storageAutoPlay = StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_AUTO_PLAY);
             FightDataManager.Instance.autoPlay = storageAutoPlay <= 0 ? false : true;

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

@@ -39,7 +39,7 @@ namespace GFGGame
         public int lastActLimitChargeId = 0;
         private int _actLimitChargeId = 0;
         /**********************************************************限时累充*************************************************/
-        public bool IsGetNewPlayerReward = true;
+        public bool IsGetNewPlayerReward = false;
         /// <summary>
         /// 当前限时累充活动id
         /// </summary>
@@ -212,6 +212,46 @@ namespace GFGGame
             }
             return true;
         }
+
+        public bool HaveGetSevenDayBonus()
+        {
+            foreach (int a in sevenDayLoginBonusStatusList)
+            {
+                if (a == 0) return true;
+            }
+            return false;
+        }
+        //判断最后可领取的奖励索引
+        public int NowSevenDayBonusDay(bool day = false)
+        {
+            if(AllSevenDayBonusGot())
+            {
+                return 8;
+            }
+            int a = 0;
+            int flog = -1;
+            if (day)
+            {
+                for (int j = 0; j < sevenDayLoginBonusStatusList.Count; j++)
+                {
+                    a = sevenDayLoginBonusStatusList[j];
+                    if (a == 1)
+                    {
+                        flog = j;
+                        return flog;
+                    }
+                }
+            }
+            else
+            {
+                for (int j = 0; j < sevenDayLoginBonusStatusList.Count; j++)
+                {
+                    a = sevenDayLoginBonusStatusList[j];
+                    if (a == 2) flog = j;
+                }
+            }
+            return flog;
+        }
         /******************************************************************************************************************/
 
         private int _firstChargeBonusStatus = 0;

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

@@ -168,5 +168,19 @@ namespace GFGGame
             return ConstInstanceZonesSubType.Normal;
         }
 
+        //章节奖励状态
+        public static Dictionary<int, int> ChapterRewardStatusDic = new Dictionary<int, int>();
+
+        public static bool GetChapterRewardStatus()
+        {
+            foreach(var item in ChapterRewardStatusDic)
+            {
+                if(item.Value == 1)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_SevenDailyTipsUI.cs

@@ -8,9 +8,8 @@ namespace UI.ActivityMain
     {
         public GComponent target;
         public GLoader m_btnBack;
-        public GLoader m_icon;
         public GTextField m_activityDesc;
-        public GButton m_GetRewardBtn;
+        public GLoader m_icon;
         public GLoader m_backBtn;
         public Transition m_t0;
         public Transition m_t1;
@@ -63,9 +62,8 @@ namespace UI.ActivityMain
         private void Init(GComponent comp)
         {
             m_btnBack = (GLoader)comp.GetChild("btnBack");
-            m_icon = (GLoader)comp.GetChild("icon");
             m_activityDesc = (GTextField)comp.GetChild("activityDesc");
-            m_GetRewardBtn = (GButton)comp.GetChild("GetRewardBtn");
+            m_icon = (GLoader)comp.GetChild("icon");
             m_backBtn = (GLoader)comp.GetChild("backBtn");
             m_t0 = comp.GetTransition("t0");
             m_t1 = comp.GetTransition("t1");
@@ -74,9 +72,8 @@ namespace UI.ActivityMain
         public void Dispose(bool disposeTarget = false)
         {
             m_btnBack = null;
-            m_icon = null;
             m_activityDesc = null;
-            m_GetRewardBtn = null;
+            m_icon = null;
             m_backBtn = null;
             m_t0 = null;
             m_t1 = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_BtnModle3.cs

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Main
+{
+    public partial class UI_BtnModle3
+    {
+        public GButton target;
+        public GLoader m_bg;
+        public GLoader m_Icon;
+        public GLoader m_textIcon;
+        public const string URL = "ui://mfvz4q8kg91j9fzc";
+        public const string PACKAGE_NAME = "Main";
+        public const string RES_NAME = "BtnModle3";
+        private static UI_BtnModle3 _proxy;
+
+        public static UI_BtnModle3 Create(GObject gObject = null)
+        {
+            var ui = new UI_BtnModle3();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_BtnModle3 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_BtnModle3();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_bg = (GLoader)comp.GetChild("bg");
+            m_Icon = (GLoader)comp.GetChild("Icon");
+            m_textIcon = (GLoader)comp.GetChild("textIcon");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_bg = null;
+            m_Icon = null;
+            m_textIcon = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_BtnModle3.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 1ccddf5c78b60a7408a1bdbae9e3a652
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_Component8.cs

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Main
+{
+    public partial class UI_Component8
+    {
+        public GComponent target;
+        public GLoader m_rewardIcon;
+        public GTextField m_rewardNum;
+        public const string URL = "ui://mfvz4q8kg91j9fzb";
+        public const string PACKAGE_NAME = "Main";
+        public const string RES_NAME = "Component8";
+        private static UI_Component8 _proxy;
+
+        public static UI_Component8 Create(GObject gObject = null)
+        {
+            var ui = new UI_Component8();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_Component8 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Component8();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_rewardIcon = (GLoader)comp.GetChild("rewardIcon");
+            m_rewardNum = (GTextField)comp.GetChild("rewardNum");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_rewardIcon = null;
+            m_rewardNum = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_Component8.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 12e297ccbd0542b44a2255fc4d62a14f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComponentListChapterItem.cs

@@ -18,11 +18,9 @@ namespace UI.Main
         public GLoader m_numBg;
         public GTextField m_txtCurProgress;
         public GTextField m_txtMaxProgress;
+        public UI_Component8 m_reward;
         public GImage m_imgLockBg;
         public GTextField m_txtLockDesc;
-        public GLoader m_rewardIcon;
-        public GTextField m_rewardNum;
-        public GGroup m_reward;
         public const string URL = "ui://mfvz4q8kslb41t";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "ComponentListChapterItem";
@@ -81,11 +79,9 @@ namespace UI.Main
             m_numBg = (GLoader)comp.GetChild("numBg");
             m_txtCurProgress = (GTextField)comp.GetChild("txtCurProgress");
             m_txtMaxProgress = (GTextField)comp.GetChild("txtMaxProgress");
+            m_reward = (UI_Component8)UI_Component8.Create(comp.GetChild("reward"));
             m_imgLockBg = (GImage)comp.GetChild("imgLockBg");
             m_txtLockDesc = (GTextField)comp.GetChild("txtLockDesc");
-            m_rewardIcon = (GLoader)comp.GetChild("rewardIcon");
-            m_rewardNum = (GTextField)comp.GetChild("rewardNum");
-            m_reward = (GGroup)comp.GetChild("reward");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -101,11 +97,10 @@ namespace UI.Main
             m_numBg = null;
             m_txtCurProgress = null;
             m_txtMaxProgress = null;
+            m_reward.Dispose();
+            m_reward = null;
             m_imgLockBg = null;
             m_txtLockDesc = null;
-            m_rewardIcon = null;
-            m_rewardNum = null;
-            m_reward = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_MainUI.cs

@@ -41,6 +41,7 @@ namespace UI.Main
         public UI_ButtonModleEffect m_btnHaiZhiShi;
         public UI_BtnModle1 m_btnDailyWelfare;
         public UI_BtnModle1 m_btnNewPlayerReward;
+        public UI_BtnModle3 m_btnSevenReward;
         public UI_BtnModle1 m_btnNewYearRedEnvelope;
         public UI_BtnModle1 m_btnActivityDay7;
         public GGroup m_AllUI;
@@ -129,6 +130,7 @@ namespace UI.Main
             m_btnHaiZhiShi = (UI_ButtonModleEffect)UI_ButtonModleEffect.Create(comp.GetChild("btnHaiZhiShi"));
             m_btnDailyWelfare = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnDailyWelfare"));
             m_btnNewPlayerReward = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnNewPlayerReward"));
+            m_btnSevenReward = (UI_BtnModle3)UI_BtnModle3.Create(comp.GetChild("btnSevenReward"));
             m_btnNewYearRedEnvelope = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnNewYearRedEnvelope"));
             m_btnActivityDay7 = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnActivityDay7"));
             m_AllUI = (GGroup)comp.GetChild("AllUI");
@@ -196,6 +198,8 @@ namespace UI.Main
             m_btnDailyWelfare = null;
             m_btnNewPlayerReward.Dispose();
             m_btnNewPlayerReward = null;
+            m_btnSevenReward.Dispose();
+            m_btnSevenReward = null;
             m_btnNewYearRedEnvelope.Dispose();
             m_btnNewYearRedEnvelope = null;
             m_btnActivityDay7.Dispose();

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

@@ -317,11 +317,11 @@ namespace GFGGame
             return false;
         }
 
-        //新人礼包领取
+        //**************************新人礼包领取
         public static async ETTask<bool> ReqGetNewPlayerBonus()
         {
             S2C_GetNewcomerRewards response = null;
-            response = (S2C_GetNewcomerRewards)await MessageHelper.SendToServer(new C2S_GetNewcomerRewards() );
+            response = (S2C_GetNewcomerRewards)await MessageHelper.SendToServer(new C2S_GetNewcomerRewards() { });
             if (response != null)
             {
                 if (response.Error == ErrorCode.ERR_Success)
@@ -337,12 +337,11 @@ namespace GFGGame
         public static async ETTask<bool> ReqGetNewPlayerBonusStatus()
         {
             S2C_GetNewcomerRewardStatus response = null;
-            response = (S2C_GetNewcomerRewardStatus)await MessageHelper.SendToServer(new C2S_GetNewcomerRewardStatus());
+            response = (S2C_GetNewcomerRewardStatus)await MessageHelper.SendToServer(new C2S_GetNewcomerRewardStatus() { });
             if (response != null)
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
-                    ActivitySProxy.SetNewPlayerOnceStatus(1);
                     ActivityDataManager.Instance.IsGetNewPlayerReward = response.Status;
                     GameGlobal.AutoNewPlayersTips = response.OpenStatus;
                     return true;
@@ -350,13 +349,13 @@ namespace GFGGame
             }
             return false;
         }
-        public static async void SetNewPlayerOnceStatus(long id)
+        public static async ETTask SetNewPlayerOnceStatus(long id)
         {
-            S2C_UpdateDataRecord response = (S2C_UpdateDataRecord)await MessageHelper.SendToServer(new C2S_UpdateDataRecord { K = 100001, V = id });
+            S2C_UpdateDataRecord response = (S2C_UpdateDataRecord)await MessageHelper.SendToServer(new C2S_UpdateDataRecord (){ K = 100001, V = id });
         }
         public static async ETTask<bool> GetNewPlayerOnceStatus()
         {
-            S2C_GetDataRecord response = (S2C_GetDataRecord)await MessageHelper.SendToServer(new C2S_GetDataRecord { });
+            S2C_GetDataRecord response = (S2C_GetDataRecord)await MessageHelper.SendToServer(new C2S_GetDataRecord() { });
             for (int i = 0; i < response.AllKs.Count; i++)
             {
                 if (response.AllKs[i] == 100001)
@@ -364,15 +363,17 @@ namespace GFGGame
                     if(response.AllVs[i] == 0)
                     {
                         GameGlobal.NewPlayerOnceTips = false;
+                        return true;
                     }
                     else
                     {
                         GameGlobal.NewPlayerOnceTips = true;
+                        return true;
                     }
-                    return true;
                 }
             }
-            return false;
+            GameGlobal.NewPlayerOnceTips = true;
+            return true;
         }
     }
     //新人活动开启状态推送

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

@@ -53,5 +53,48 @@ namespace GFGGame
             return false;
         }
 
+        //请求章节奖励数据
+        public static async ETTask<bool> GetStoryBonusDate()
+        {
+            S2C_GetChapterPassStatus response = null;
+            response = (S2C_GetChapterPassStatus)await MessageHelper.SendToServer(new C2S_GetChapterPassStatus() {  });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    MainStoryDataManager.ChapterRewardStatusDic.Clear();
+                    for(int i = 0;i < response.PassStatusKs.Count;i++)
+                    {
+                        MainStoryDataManager.ChapterRewardStatusDic.Add(response.PassStatusKs[i], response.PassStatusVs[i]);
+                    }    
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        //领取章节奖励数据
+        public static async ETTask<bool> GetStoryBonusReward(int id)
+        {
+            S2C_GethapterPassReward response = null;
+            response = (S2C_GethapterPassReward)await MessageHelper.SendToServer(new C2S_GethapterPassReward() { ChapterId = id});
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    for (int i = 0; i < response.PassStatusKs.Count; i++)
+                    {
+                        if(response.PassStatusKs[i] == id)
+                        {
+                            MainStoryDataManager.ChapterRewardStatusDic[i] = response.PassStatusVs[i];
+                        }  
+                    }
+                    BonusController.TryShowBonusList(ItemUtil.CreateItemDataList(response.BonusList));
+                    return true;
+                }
+            }
+            return false;
+        }
+
     }
 }

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

@@ -152,14 +152,14 @@ namespace GFGGame
         public static async ETTask<bool> ReqSetDataRecord(long SuitID)
         {
             TimeTracingDataManager.Instance.LevelRankDatasDic[1].Clear();
-            S2C_UpdateDataRecord response = (S2C_UpdateDataRecord)await MessageHelper.SendToServer(new C2S_UpdateDataRecord { K = 6200123,V = SuitID });
+            S2C_UpdateDataRecord response = (S2C_UpdateDataRecord)await MessageHelper.SendToServer(new C2S_UpdateDataRecord() { K = 6200123,V = SuitID });
             return true;
         }
 
         public static async ETTask<bool> ReqGetDataRecord()
         {
             TimeTracingDataManager.Instance.LevelRankDatasDic[1].Clear();
-            S2C_GetDataRecord response = (S2C_GetDataRecord)await MessageHelper.SendToServer(new C2S_GetDataRecord { });
+            S2C_GetDataRecord response = (S2C_GetDataRecord)await MessageHelper.SendToServer(new C2S_GetDataRecord() { });
             for(int i = 0; i<response.AllKs.Count;i++)
             {
                 if(response.AllKs[i] == 6200123)

GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/NewPlayerTipsView.cs

@@ -54,9 +54,9 @@ namespace GFGGame
 
         }
 
-        private void UpdateInfo()
+        private async void UpdateInfo()
         {
-            ActivitySProxy.SetNewPlayerOnceStatus(0);
+           await ActivitySProxy.SetNewPlayerOnceStatus(0);
         }
         private async void OnClickGetReward()
         {
@@ -67,7 +67,7 @@ namespace GFGGame
         private void OnClickChange()
         {
             GameGlobal.NewPlayerOnceTips = false;
-            this.Hide();
+            _ui.m_t0.Play(() => { this.Hide(); });
         }
 
     }

GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/SevenDailyTipsView.cs

@@ -28,7 +28,7 @@ namespace GFGGame
             this.viewCom = _ui.target;
             isfullScreen = true;
             modal = true;
-            _ui.m_GetRewardBtn.onClick.Add(OnClickGetReward);
+            _ui.m_icon.onClick.Add(OnClickGetReward);
             _ui.m_backBtn.onClick.Add(OnClickChange);
             _ui.m_btnBack.onClick.Add(OnClickChange);
         }

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

@@ -144,6 +144,21 @@ namespace GFGGame
             }
 
         }
+        private async void OnClickReward(EventContext context)
+        {
+            GObject chapterItem = context.sender as GObject;
+            int chapterID = (int)chapterItem.data;
+            int status;
+            if(MainStoryDataManager.ChapterRewardStatusDic.TryGetValue(chapterID,out status) && status == 1)
+            {
+                //领取奖励
+                bool result = await MainStorySProxy.GetStoryBonusReward(chapterID);
+                if(result)
+                {
+                    return;
+                }
+            }
+        }
 
         private void ListChapterItem(int index, GObject item)
         {
@@ -270,15 +285,38 @@ namespace GFGGame
                     
                     if(InstanceZonesDataManager.CheckLevelPass(storylevelList[storylevelList.Count - 1].id))
                     {
-                        listItem.m_content.m_reward.visible = true;
+                        listItem.m_content.m_reward.target.visible = true;
+                        RedDotController.Instance.SetComRedDot(listItem.m_content.m_reward.target, false, "");
+                        int status;
+                        if (MainStoryDataManager.ChapterRewardStatusDic.TryGetValue(chapterID, out status))
+                        {
+                            List<ChapterRewardCfg> chapterReward = ChapterRewardCfgArray.Instance.GetCfgsBychapterId(chapterID);
+                            listItem.m_content.m_reward.m_rewardIcon.url = ResPathUtil.GetIconPath(ItemCfgArray.Instance.GetCfg(chapterReward[0].bonusOnceArr[0][0]).res, "png");
+                            listItem.m_content.m_reward.m_rewardNum.text = string.Format("x{0}", chapterReward[0].bonusOnceArr[0][1].ToString());
+                        }
+                        if (MainStoryDataManager.ChapterRewardStatusDic.TryGetValue(chapterID, out status) && status == 1)
+                        {
+                            RedDotController.Instance.SetComRedDot(listItem.m_content.m_reward.target, true, "");
+                        }
+                        else if (MainStoryDataManager.ChapterRewardStatusDic.TryGetValue(chapterID, out status) && status == 2)
+                        {
+                            listItem.m_content.m_reward.target.visible = false;
+                        }
+
+                        if (listItem.m_content.m_reward.target.data == null)
+                        {
+                            listItem.m_content.m_reward.target.onClick.Add(OnClickReward);
+                        }
+                        listItem.m_content.m_reward.target.data = chapterCfg.id;
                     }
                     else
                     {
-                        listItem.m_content.m_reward.visible = false;
+                        listItem.m_content.m_reward.target.visible = false;
                     }
                 }
                 else
                 {
+                    listItem.m_content.m_reward.target.visible = false;
                     listItem.m_content.m_imgLockBg.visible = true;
                     listItem.m_content.m_txtLockDesc.visible = true;
                     if (chapterCfg.lvl > GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl))

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

@@ -23,6 +23,7 @@ namespace GFGGame
 
                 if (fistPassLastLvl)
                 {
+                    MainStorySProxy.GetStoryBonusDate().Coroutine();
                     StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(levelCfgId);
                     StoryChapterCfg nextStoryChapterCfg = StoryChapterCfgArray.Instance.GetCfg(levelCfg.chapterId + 1);
                     if (nextStoryChapterCfg != null)

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

@@ -130,6 +130,7 @@ namespace GFGGame
             _ui.m_touchMask.onClick.Add(ShowMainUI);
             _ui.m_btnShow.target.onClick.Add(HideMainUI);
             _ui.m_btnNewPlayerReward.target.onClick.Add(OnClickNewPlayerReward);
+            _ui.m_btnSevenReward.target.onClick.Add(OnClickSevenReward);
 
             _ui.m_comListAd.m_listAd.itemRenderer = RenderListAdItem;
             _ui.m_comListAd.m_listAd.SetVirtualAndLoop();
@@ -555,6 +556,10 @@ namespace GFGGame
         {
             ViewManager.Show<NewPlayersTipsView>();
         }
+        private void OnClickSevenReward()
+        {
+            ViewManager.Show<SevenDayLoginView>();
+        }
 
         //列表
         private void OnClickBtnGiftBag1()
@@ -739,12 +744,36 @@ namespace GFGGame
             _ui.m_btnTea.target.visible = ActivityDataManager.Instance.GetCurOpenActiveByType(12) == 0 ? false : true;
             _ui.m_btnActivityZCJB.target.visible = ActivityDataManager.Instance.GetCurOpenActiveByType(17) == 0 ? false: true;
             _ui.m_btnNewPlayerReward.target.visible = ActivityDataManager.Instance.IsGetNewPlayerReward;
+
+            _ui.m_btnSevenReward.target.visible = !ActivityDataManager.Instance.AllSevenDayBonusGot();
+            UpdateSevenIcon();
+
             if (ActivityDataManager.Instance.IsGetNewPlayerReward)
             {
                 RedDotController.Instance.SetComRedDot(_ui.m_btnNewPlayerReward.target, true, "", -8);
             }
         }
 
+        private void UpdateSevenIcon()
+        {
+            if(ActivityDataManager.Instance.CanGetSevenDayBonus())
+            {
+                //显示今日可领取
+                int id = DailyLoginCfgArray.Instance.dataArray[ActivityDataManager.Instance.NowSevenDayBonusDay(true)].rewardsArr[0][0];
+                _ui.m_btnSevenReward.m_Icon.url = ResPathUtil.GetIconPath(ItemCfgArray.Instance.GetCfg(id).res,"png");
+                _ui.m_btnSevenReward.m_textIcon.url = "ui://Main/zjm_hdjrkl";
+                RedDotController.Instance.SetComRedDot(_ui.m_btnSevenReward.target, true, "", -8);
+            }
+            else if(ActivityDataManager.Instance.HaveGetSevenDayBonus() && ActivityDataManager.Instance.NowSevenDayBonusDay(false)<6)
+            {
+                //显示明日可领取
+                int id = DailyLoginCfgArray.Instance.dataArray[ActivityDataManager.Instance.NowSevenDayBonusDay(false)+1].rewardsArr[0][0];
+                _ui.m_btnSevenReward.m_Icon.url = ResPathUtil.GetIconPath(ItemCfgArray.Instance.GetCfg(id).res,"png");
+                _ui.m_btnSevenReward.m_textIcon.url = "ui://Main/zjm_hdmrkl";
+                RedDotController.Instance.SetComRedDot(_ui.m_btnSevenReward.target, false, "", -8);
+            }
+        }
+
         private void UpdateTime()
         {
             //if (_ui.m_btnTea.target.visible)
@@ -934,6 +963,10 @@ namespace GFGGame
             {
                 RedDotController.Instance.SetComRedDot(_ui.m_btnNewPlayerReward.target, true, "", -8);
             }
+
+            _ui.m_btnSevenReward.target.visible = !ActivityDataManager.Instance.AllSevenDayBonusGot();
+            UpdateSevenIcon();
+
             _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);

GameClient/Assets/ResIn/UI/Main/Main_atlas0_12!a.png.meta → GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_5!a.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 56a0f6951bdb4924ab3830e1c265a34f
+guid: 38cf6fce6aef40c4ab34bb4830a61b37
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -62,7 +62,7 @@ TextureImporter:
   textureFormatSet: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
-  cookieLightType: 1
+  cookieLightType: 0
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
@@ -77,19 +77,19 @@ TextureImporter:
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
-    buildTarget: iPhone
+    buildTarget: Standalone
     maxTextureSize: 2048
     resizeAlgorithm: 0
-    textureFormat: 50
+    textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 1
+    overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
-    buildTarget: Android
+    buildTarget: iPhone
     maxTextureSize: 2048
     resizeAlgorithm: 0
     textureFormat: 50
@@ -101,15 +101,15 @@ TextureImporter:
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
-    buildTarget: Standalone
+    buildTarget: Android
     maxTextureSize: 2048
     resizeAlgorithm: 0
-    textureFormat: -1
+    textureFormat: 50
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:

GameClient/Assets/ResIn/UI/Main/Main_atlas0_12.png.meta → GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_5.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a5c6666546101144890f1fcbdfc950c8
+guid: a4dd50963a728d44f902725eb8dd3c12
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -62,7 +62,7 @@ TextureImporter:
   textureFormatSet: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
-  cookieLightType: 1
+  cookieLightType: 0
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
@@ -77,19 +77,19 @@ TextureImporter:
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
-    buildTarget: iPhone
+    buildTarget: Standalone
     maxTextureSize: 2048
     resizeAlgorithm: 0
-    textureFormat: 50
+    textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 1
+    overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
-    buildTarget: Android
+    buildTarget: iPhone
     maxTextureSize: 2048
     resizeAlgorithm: 0
     textureFormat: 50
@@ -101,15 +101,15 @@ TextureImporter:
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
-    buildTarget: Standalone
+    buildTarget: Android
     maxTextureSize: 2048
     resizeAlgorithm: 0
-    textureFormat: -1
+    textureFormat: 50
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet: