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

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

@@ -276,6 +276,7 @@ namespace GFGGame
             LeagueSproxy.GetTeapartyMatchingInfos(RoleDataManager.roleId).Coroutine();
             ActivitySProxy.ReqGetActivitySignInfos().Coroutine();
             ShopSProxy.ReqGetGrowthFundInfo().Coroutine();
+            ActivityAfuGiftSProxy.GetSummerGiftInfo().Coroutine();
             //RoleInfoSProxy.ReqNewRoleGetSuitStatus().Coroutine();
 
             int storageAutoPlay = StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_AUTO_PLAY);

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

@@ -18,10 +18,19 @@ namespace GFGGame
                 StoryChapterCfg chapterCfg = _chapterCfgs[i];
                 if (i == _chapterCfgs.Count - 1 && MainStoryDataManager.CheckChapterUnlock(chapterCfg.id))
                 {
-                    MainStoryDataManager.currentChapterCfgId = chapterCfg.id;
-                    ViewManager.Show<StoryChapterView>(new object[] { chapterCfg.id, 0 });
-                    isOpen = false;
-                    return isOpen;
+                    if (StoryController.CheckSuitGot(_chapterCfgs[i-1].suitId))
+                    {
+                        MainStoryDataManager.currentChapterCfgId = chapterCfg.id;
+                        ViewManager.Show<StoryChapterView>(new object[] { chapterCfg.id, 0 });
+                        isOpen = false;
+                        return isOpen;
+                    }
+                    else
+                    {
+                        ViewManager.Show<StoryChapterListView>(new object[] { 0, Mathf.Max(0, chapterCfg.order - 1) });
+                        isOpen = false;
+                        return isOpen;
+                    }
                 }
                 else if (!MainStoryDataManager.CheckChapterUnlock(chapterCfg.id))
                 {

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

@@ -21,6 +21,15 @@ namespace GFGGame
         private List<ActivityLoginCfg> _rewardCfgs;
         public List<ActivityLoginCfg> RewardCfgs { get => _rewardCfgs; set => _rewardCfgs = value; }
 
+        //消暑礼包
+        public int SummerActivityID = 3003;
+        public bool IsSummerGiftBuy = false;
+        public Dictionary<int, List<int>> SummerGiftRewardState = new Dictionary<int, List<int>>()
+        {
+            [0] = new List<int>(),
+            [1] = new List<int>()
+        };
+
         private bool _isOpen;
         public bool IsOpen { get => _isOpen; set => _isOpen = value; }
 
@@ -113,5 +122,26 @@ namespace GFGGame
             //_normalRewards.Clear();
             //_superRewards.Clear();
         }
+
+        public bool GetSummerGiftRewardAllState()
+        {
+            long curTime = TimeHelper.ServerNow();
+            var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(SummerActivityID);
+            if (activityInfo == null)
+            {
+                return false;
+            }
+            foreach (var item in SummerGiftRewardState)
+            {
+                foreach(var state in item.Value)
+                {
+                    if(state == 1)
+                    {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
     }
 }

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

@@ -27,6 +27,7 @@ namespace GFGGame
 
         public List<ArenaHistoryData> HistoryDatas = new List<ArenaHistoryData>(); //获取竞技场历史记录
 
+        public Dictionary<int,int> GradeRewardStateDic = new Dictionary<int, int>(); //段位奖励数据
         /*************************************************************************************************************************************/
         // public Dictionary<int, Texture2D> TextureDic = new Dictionary<int, Texture2D>();
         public List<int> roundTime = new List<int>();

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

@@ -400,15 +400,15 @@ namespace GFGGame
             {
                 var activityFightCfg = ActivityFightCfgArray.Instance.GetCfg(levelCfg.chapterId);
                 RoleLimitData limitData = RoleLimitDataManager.GetLimitData(activityFightCfg.limit);
-                times = limitData.TotalPlayMax - limitData.PlayTimes;
-                times = Math.Min(times, 10);
+                int time = limitData.TotalPlayMax - limitData.PlayTimes;
+                times = Math.Min(times, time);
             }
             else if(type == 1 && subType == 1)
             {
                 //精英关卡特殊处理
                 RoleLimitData limitData = RoleLimitDataManager.GetLimitData(50);
-                times = limitData.TotalPlayMax - limitData.PlayTimes;
-                times = Math.Min(times, 10);
+                int time = limitData.TotalPlayMax - limitData.PlayTimes;
+                times = Math.Min(times, time);
             }
             title = string.Format("挑战{0}次", NumberUtil.GetChiniseNumberText(times));
         }

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

@@ -196,6 +196,11 @@ namespace GFGGame
         {
             foreach(var item in ChapterRewardStatusDic)
             {
+                StoryChapterCfg chapterRewardCfg = StoryChapterCfgArray.Instance.GetCfg(item.Key);
+                if(chapterRewardCfg.type == 1 && chapterRewardCfg.subType == 1)
+                {
+                    continue;
+                }
                 if(item.Value == 1)
                 {
                     return true;

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

@@ -138,6 +138,25 @@ namespace GFGGame
         }
 
         /// <summary>
+        /// 判断所有章节是否有奖励可领
+        /// </summary>
+        /// <returns></returns>
+        public bool GetChapterRed()
+        {
+            for (int i = 0; i < StoryChapterCfgArray.Instance.dataArray.Length; i++)
+            {
+                for (int j = 0; j < 3; j++)
+                {
+                    int state = MainStoryDataManager.GetChapterBonusStatus(StoryChapterCfgArray.Instance.dataArray[i].id, j);
+                    if (state == ConstBonusStatus.CAN_GET)
+                    {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
+        /// <summary>
         /// 根据章节Id判断是否有奖励可领
         /// </summary>
         /// <returns></returns>
@@ -660,7 +679,7 @@ namespace GFGGame
         /// <returns></returns>
         public bool GetShopRed()
         {
-            return GetChargeAddUpRewardRed() || GetGiftBagRewardRed() || GetGoldCardRewardRed() || GetBlackCardRewardRed() || GetBlackCardClothingRed() || GetStoreBrocadeWeavRewardRed() || GetGiftBagRebateRed() || GetGrowthFundRewardRed();
+            return GetChargeAddUpRewardRed() || GetGiftBagRewardRed() || GetGoldCardRewardRed() || GetBlackCardRewardRed() || GetBlackCardClothingRed() || GetStoreBrocadeWeavRewardRed() || GetGiftBagRebateRed() || GetGrowthFundRewardRed() || ActivityAfuGiftDataManager.Instance.GetSummerGiftRewardAllState();
         }
         //商店-充值-会员中心
         public bool GetChargeAddUpRewardRed()

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_ComList.cs

@@ -11,6 +11,7 @@ namespace UI.DailyWelfare
         public UI_Button1 m_btnSevenDayLogin;
         public UI_Button1 m_btnSign;
         public UI_Button1 m_btnSupply;
+        public UI_Button1 m_btnGrowthFund;
         public const string URL = "ui://t8nwuj7ivols22";
         public const string PACKAGE_NAME = "DailyWelfare";
         public const string RES_NAME = "ComList";
@@ -62,6 +63,7 @@ namespace UI.DailyWelfare
             m_btnSevenDayLogin = (UI_Button1)UI_Button1.Create(comp.GetChild("btnSevenDayLogin"));
             m_btnSign = (UI_Button1)UI_Button1.Create(comp.GetChild("btnSign"));
             m_btnSupply = (UI_Button1)UI_Button1.Create(comp.GetChild("btnSupply"));
+            m_btnGrowthFund = (UI_Button1)UI_Button1.Create(comp.GetChild("btnGrowthFund"));
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -72,6 +74,8 @@ namespace UI.DailyWelfare
             m_btnSign = null;
             m_btnSupply.Dispose();
             m_btnSupply = null;
+            m_btnGrowthFund.Dispose();
+            m_btnGrowthFund = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -12,6 +12,7 @@ namespace UI.Main
         public GGraph m_mask1;
         public GGraph m_mask2;
         public GGraph m_btnNext;
+        public GGraph m_effect;
         public UI_CompDialogText m_dialogText;
         public UI_CompDialogName m_dialogName;
         public UI_CompDialogHead m_dialogHead;
@@ -25,7 +26,6 @@ namespace UI.Main
         public GTextField m_txtPlayName;
         public GGroup m_comPlayName;
         public GGraph m_mask;
-        public GGraph m_effect;
         public GLoader m_eyeOpen;
         public Transition m_t0;
         public Transition m_showMask;
@@ -85,6 +85,7 @@ namespace UI.Main
             m_mask1 = (GGraph)comp.GetChild("mask1");
             m_mask2 = (GGraph)comp.GetChild("mask2");
             m_btnNext = (GGraph)comp.GetChild("btnNext");
+            m_effect = (GGraph)comp.GetChild("effect");
             m_dialogText = (UI_CompDialogText)UI_CompDialogText.Create(comp.GetChild("dialogText"));
             m_dialogName = (UI_CompDialogName)UI_CompDialogName.Create(comp.GetChild("dialogName"));
             m_dialogHead = (UI_CompDialogHead)UI_CompDialogHead.Create(comp.GetChild("dialogHead"));
@@ -98,7 +99,6 @@ namespace UI.Main
             m_txtPlayName = (GTextField)comp.GetChild("txtPlayName");
             m_comPlayName = (GGroup)comp.GetChild("comPlayName");
             m_mask = (GGraph)comp.GetChild("mask");
-            m_effect = (GGraph)comp.GetChild("effect");
             m_eyeOpen = (GLoader)comp.GetChild("eyeOpen");
             m_t0 = comp.GetTransition("t0");
             m_showMask = comp.GetTransition("showMask");
@@ -114,6 +114,7 @@ namespace UI.Main
             m_mask1 = null;
             m_mask2 = null;
             m_btnNext = null;
+            m_effect = null;
             m_dialogText.Dispose();
             m_dialogText = null;
             m_dialogName.Dispose();
@@ -131,7 +132,6 @@ namespace UI.Main
             m_txtPlayName = null;
             m_comPlayName = null;
             m_mask = null;
-            m_effect = null;
             m_eyeOpen = null;
             m_t0 = null;
             m_showMask = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_StoreSummerGiftUI.cs

@@ -0,0 +1,83 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Store
+{
+    public partial class UI_StoreSummerGiftUI
+    {
+        public GComponent target;
+        public GTextField m_LeftTime;
+        public GButton m_tip;
+        public GButton m_btnOpen;
+        public GList m_RewardList;
+        public GButton m_btnGetAll;
+        public const string URL = "ui://p9mtgheop3fttfb";
+        public const string PACKAGE_NAME = "Store";
+        public const string RES_NAME = "StoreSummerGiftUI";
+        private static UI_StoreSummerGiftUI _proxy;
+
+        public static UI_StoreSummerGiftUI Create(GObject gObject = null)
+        {
+            var ui = new UI_StoreSummerGiftUI();
+            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_StoreSummerGiftUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_StoreSummerGiftUI();
+            }
+            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_LeftTime = (GTextField)comp.GetChild("LeftTime");
+            m_tip = (GButton)comp.GetChild("tip");
+            m_btnOpen = (GButton)comp.GetChild("btnOpen");
+            m_RewardList = (GList)comp.GetChild("RewardList");
+            m_btnGetAll = (GButton)comp.GetChild("btnGetAll");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_LeftTime = null;
+            m_tip = null;
+            m_btnOpen = null;
+            m_RewardList = null;
+            m_btnGetAll = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_StoreSummerGiftUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_StoreUI.cs

@@ -7,6 +7,7 @@ namespace UI.Store
     public partial class UI_StoreUI
     {
         public GComponent target;
+        public GLoader m_bg;
         public GLoader m_loaBg;
         public GButton m_btnBack;
         public UI_ComTab m_comTab;
@@ -58,6 +59,7 @@ namespace UI.Store
 
         private void Init(GComponent comp)
         {
+            m_bg = (GLoader)comp.GetChild("bg");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_comTab = (UI_ComTab)UI_ComTab.Create(comp.GetChild("comTab"));
@@ -65,6 +67,7 @@ namespace UI.Store
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_bg = null;
             m_loaBg = null;
             m_btnBack = null;
             m_comTab.Dispose();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_SummerGiftRewardItem.cs

@@ -0,0 +1,80 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Store
+{
+    public partial class UI_SummerGiftRewardItem
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GTextField m_Level;
+        public GComponent m_NormalReward;
+        public GList m_RewardList;
+        public const string URL = "ui://p9mtgheop3fttfh";
+        public const string PACKAGE_NAME = "Store";
+        public const string RES_NAME = "SummerGiftRewardItem";
+        private static UI_SummerGiftRewardItem _proxy;
+
+        public static UI_SummerGiftRewardItem Create(GObject gObject = null)
+        {
+            var ui = new UI_SummerGiftRewardItem();
+            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_SummerGiftRewardItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_SummerGiftRewardItem();
+            }
+            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_c1 = comp.GetController("c1");
+            m_Level = (GTextField)comp.GetChild("Level");
+            m_NormalReward = (GComponent)comp.GetChild("NormalReward");
+            m_RewardList = (GList)comp.GetChild("RewardList");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_Level = null;
+            m_NormalReward = null;
+            m_RewardList = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_SummerGiftRewardItem.cs.meta

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

GameClient/Assets/Game/HotUpdate/GameConfig.cs

@@ -32,7 +32,7 @@ namespace GFGGame
             var result = JsonMapper.ToObject<Result>(json);
             LoginAddress = result.loginApiUrl;
             // LoginAddress = "http://login.gfg.com:10005";
-            //LoginAddress = "192.168.2.12:10005";//测试地址
+            // LoginAddress = "192.168.2.12:10005";//测试地址
             showGM = int.Parse(result.showGM);
             if(!string.IsNullOrEmpty(result.openTime))
             {

GameClient/Assets/Game/HotUpdate/Platform/QDDouYouManager.cs

@@ -111,7 +111,7 @@ namespace GFGGame
             //自定义参数
             string other = orderID + "|gfg|" + roleInfo.Id;
             QDDouYouManagerInit.Instance.ShowSwitchPayment(orderID, price.ToString(), buyID.ToString(),
-                shopCfg.itemName, itemCfg.desc,
+                shopCfg.itemName, string.Empty,
                 roleInfo.ServerId.ToString(), serverName, roleInfo.Id.ToString(), roleInfo.Name, lvl.ToString(), other);
         }
 

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

@@ -102,7 +102,66 @@ namespace GFGGame
             EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
             return false;
         }
-    }
 
+        //消暑礼包
+        public static async ETTask GetSummerGiftInfo()
+        {
+            var response =
+                (S2C_GetActivityLoginInfoExt)await MessageHelper.SendToServer(new C2S_GetActivityLoginInfoExt {});
+            if (!(response is { Error: ErrorCode.ERR_Success })) return;
+            ActivityAfuGiftDataManager.Instance.IsSummerGiftBuy = response.ActivityLoginInfo.IsBuy;
+            ActivityAfuGiftDataManager.Instance.SummerGiftRewardState[0] = response.ActivityLoginInfo.FreeRewardStatusList;
+            ActivityAfuGiftDataManager.Instance.SummerGiftRewardState[1] = response.ActivityLoginInfo.PayRewardStatusList;
+        }
 
+        public static async ETTask<bool> ReqGetSummerGiftReward(bool ispay,int rewardDay)
+        {
+            var response =
+                (S2C_GetActivityLoginRewardExt)await MessageHelper.SendToServer(new C2S_GetActivityLoginRewardExt()
+                { IsPay = ispay, RewardDay = rewardDay });
+            if (!(response is { Error: ErrorCode.ERR_Success })) return false;
+            ActivityAfuGiftDataManager.Instance.IsSummerGiftBuy = response.ActivityLoginInfo.IsBuy;
+            ActivityAfuGiftDataManager.Instance.SummerGiftRewardState[0] = response.ActivityLoginInfo.FreeRewardStatusList;
+            ActivityAfuGiftDataManager.Instance.SummerGiftRewardState[1] = response.ActivityLoginInfo.PayRewardStatusList;
+            // 奖励弹窗
+            BonusController.TryShowBonusList(ItemUtil.CreateItemDataList(response.BonusList));
+            EventAgent.DispatchEvent(ConstMessage.NUMERIC_CHANGE);
+            return false;
+        }
+        public static async ETTask<bool> ReqGetSummerGiftAllReward()
+        {
+            var response =
+                (S2C_GetAllActivityLoginRewardExt)await MessageHelper.SendToServer(new C2S_GetAllActivityLoginRewardExt() { });
+            if (!(response is { Error: ErrorCode.ERR_Success })) return false;
+            ActivityAfuGiftDataManager.Instance.IsSummerGiftBuy = response.ActivityLoginInfo.IsBuy;
+            ActivityAfuGiftDataManager.Instance.SummerGiftRewardState[0] = response.ActivityLoginInfo.FreeRewardStatusList;
+            ActivityAfuGiftDataManager.Instance.SummerGiftRewardState[1] = response.ActivityLoginInfo.PayRewardStatusList;
+            // 奖励弹窗
+            BonusController.TryShowBonusList(ItemUtil.CreateItemDataList(response.BonusList));
+            EventAgent.DispatchEvent(ConstMessage.NUMERIC_CHANGE);
+            return false;
+        }
+    }
+}
+
+namespace ET
+{
+    public class ActivitySummerGiftProtoHandler : AMHandler<S2C_PushActivityLoginInfoExt>
+    {
+        /// <summary>
+        /// 消暑活动的开启/结束/充值
+        /// </summary>
+        /// <param name="session"></param>
+        /// <param name="message"></param>
+        /// <returns></returns>
+        protected override async ETTask Run(Session session, S2C_PushActivityLoginInfoExt message)
+        {
+            var info = message.ActivityLoginInfo;
+            ActivityAfuGiftDataManager.Instance.IsSummerGiftBuy = info.IsBuy;
+            ActivityAfuGiftDataManager.Instance.SummerGiftRewardState[0] = info.FreeRewardStatusList;
+            ActivityAfuGiftDataManager.Instance.SummerGiftRewardState[1] = info.PayRewardStatusList;
+            EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
+            await ETTask.CompletedTask;
+        }
+    }
 }

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

@@ -486,5 +486,42 @@ namespace GFGGame
             }
             return true;
         }
+        //获取段位奖励状态
+        public static async ETTask<bool> ReqGetSeasonGradeRewardStatus()
+        {
+            var response = (S2C_GetSeasonGradeRewardStatus)await MessageHelper.SendToServer(new C2S_GetSeasonGradeRewardStatus() { RoleId = RoleDataManager.roleId});
+            if (!(response is { Error: ErrorCode.ERR_Success })) return false;
+            for (int i = 0; i < response.RewardStatusKs.Count; i++)
+            {
+                if(ArenaDataManager.Instance.GradeRewardStateDic.ContainsKey(response.RewardStatusKs[i]))
+                {
+                    ArenaDataManager.Instance.GradeRewardStateDic[response.RewardStatusKs[i]] = response.RewardStatusVs[i];
+                }
+                else
+                {
+                    ArenaDataManager.Instance.GradeRewardStateDic.Add(response.RewardStatusKs[i] , response.RewardStatusVs[i]);
+                }
+            }
+            return true;
+        }
+        //获取段位奖励
+        public static async ETTask<bool> ReqGetSeasonGradeReward(int grade)
+        {
+            var response = (S2C_GetSeasonGradeReward)await MessageHelper.SendToServer(new C2S_GetSeasonGradeReward() { RoleId = RoleDataManager.roleId,Grade = grade  });
+            if (!(response is { Error: ErrorCode.ERR_Success })) return false;
+            for (int i = 0; i < response.RewardStatusKs.Count; i++)
+            {
+                if (ArenaDataManager.Instance.GradeRewardStateDic.ContainsKey(response.RewardStatusKs[i]))
+                {
+                    ArenaDataManager.Instance.GradeRewardStateDic[response.RewardStatusKs[i]] = response.RewardStatusVs[i];
+                }
+                else
+                {
+                    ArenaDataManager.Instance.GradeRewardStateDic.Add(response.RewardStatusKs[i], response.RewardStatusVs[i]);
+                }
+            }
+            BonusController.TryShowBonusList(ItemUtil.CreateItemDataList(response.BonusList));
+            return true;
+        }
     }
 }

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

@@ -65,6 +65,7 @@ namespace GFGGame
                     await ActivitySProxy.ReqSevenDayLoginInfos();
                     await ActivityGlobalSProxy.GetActivityInfo();
                     await ActivityAfuGiftSProxy.GetAfuGiftInfo();
+                    await ActivityAfuGiftSProxy.GetSummerGiftInfo();
                     await ActivityTeaSProxy.ReqGetNPCVisitInfo();
                     await MiniGameProxy.ReqGetChallengeReward();
                     ActivitySProxy.ReqGetActivitySignInfos().Coroutine();

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

@@ -193,10 +193,7 @@ namespace GFGGame
         public static async ETTask<bool> ReqGetGrowthFundInfo(int activityID = 3002)
         {
             ActivityOpenCfg activityCfg = ActivityOpenCfgArray.Instance.GetCfg(activityID);
-            if(RoleDataManager.lvl < activityCfg.level || ShopDataManager.Instance.GrowthFundRewardList.Count == GrowthFundCfgArray.Instance.dataArray.Length)
-            {
-                return false;
-            }
+            ShopDataManager.Instance.GrowthFundRewardList.Clear();
             S2C_GetGrowthFundRewrdStatus response = null;
             response = (S2C_GetGrowthFundRewrdStatus)await MessageHelper.SendToServer(new C2S_GetGrowthFundRewrdStatus() { ActivityId = activityID});
             if (response != null)

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

@@ -253,6 +253,18 @@ namespace GFGGame
             com.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(cfg1.res);
 
         }
+        public static void UpdateItemAndNeed(GObject obj, int itemId, int needNum, bool ChangeColor = false)
+        {
+            UI_ComCostCurrencyWithHas com = UI_ComCostCurrencyWithHas.Proxy(obj);
+            long hasNum = ItemDataManager.GetItemNum(itemId);
+            string needStrColor = ChangeColor ? "#B99F7B" : "#FDEED4";
+            string strHasNum = StringUtil.GetColorText(hasNum.ToString(), hasNum < needNum ? "#C5645A" : needStrColor); hasNum.ToString();
+            // com.m_txtNeed.text = needNum.ToString();
+            com.m_txtCount.text = string.Format("{0}{1}{2}", strHasNum, StringUtil.GetColorText("/", needStrColor), StringUtil.GetColorText(needNum.ToString(), needStrColor));
+            ItemCfg cfg1 = ItemCfgArray.Instance.GetCfg(itemId);
+            com.m_loaIcon.url = ResPathUtil.GetIconPath(cfg1.res,"png");
+
+        }
         public static void UpdateItemNeedNum(GObject obj, int itemId, int needNum, bool checkNum = true, string color = "#716B59")
         {
             UI_ComCostCurrency com = UI_ComCostCurrency.Proxy(obj);

GameClient/Assets/Game/HotUpdate/Views/ActivityHuaRongDao/ActivityHuaRongDaoEntryView.cs

@@ -246,10 +246,14 @@ namespace GFGGame
         private void UpdateTime(object param)
         {
             long curTime = ActivityDataManager.Instance.GetActivityTime(_activityID);
-            if (curTime <= 0)
+            if (curTime > 0)
             {
                 _ui.m_txtTime.text = "剩余" + TimeUtil.FormattingTimeTo_DDHHmm(curTime);
             }
+            else
+            {
+                _ui.m_txtTime.visible = false;
+            }
         }
 
         private void UpdateRedDots()

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

@@ -172,13 +172,9 @@ namespace GFGGame
         private int ReturnDiscountTimeSuitIndex()
         {
             int count = 0;
-            long endTime;
-            long startTime;
             foreach (var item in zgthdcListCfg)
             {
-                endTime = TimeUtil.DateTimeToTimestamp(item.endTime);
-                startTime = TimeUtil.DateTimeToTimestamp(item.openTime);
-                if (startTime <= TimeHelper.ServerNow() && endTime > TimeHelper.ServerNow())
+                if (IsDisountTime(item))
                 {
                     indexSuit = count;
                     return indexSuit;
@@ -187,6 +183,19 @@ namespace GFGGame
             }
             return indexSuit;
         }
+        private bool IsDisountTime(EverydaySaleCfg item)
+        {
+            if (item.activityId == 6002 && item.openTime == "")
+            {
+                return ActivityGlobalDataManager.Instance.IsActivityOpen(item.activityId);
+            }
+            long second = TimeHelper.ServerNow() - second_CreateRole;
+            if (second < (saleSecondNum * item.id) && second >= (saleSecondNum * (item.id - 1)))
+            {
+                return true;
+            }
+            return false;
+        }
         private void UpdateTime(object param)
         {
             var activityInfo = zgthdcListCfg[indexSuit];

GameClient/Assets/Game/HotUpdate/Views/Card/CardDetailView.cs

@@ -167,7 +167,7 @@ namespace GFGGame
                 }
             }
             
-            int starLevelDodge = data.star / 5;
+            int starLevelDodge = data.star / 6;
             listItem.m_starNumType.selectedIndex = data.itemCfg.starDescArr.Length - 1;
             for (int i = 0; i < data.itemCfg.starDescArr.Length; i++)
             {

GameClient/Assets/Game/HotUpdate/Views/Card/CardStarRewardView.cs

@@ -3,6 +3,7 @@ using System.Collections;
 using System.Collections.Generic;
 using UI.Card;
 using UnityEngine;
+using YooAsset;
 
 namespace GFGGame
 {
@@ -70,7 +71,15 @@ namespace GFGGame
             {
                 item.m_txtTitle.text = string.Format("词牌星级达到{0}星", NumberUtil.GetChiniseNumberText(cardStarCfg.starLvl / 5));
             }
-            item.m_txtTips.visible = cardStarCfg.starLvl == cardData.itemCfg.animationCardStar;
+            string resPath = ResPathUtil.GetCardAnimationPath(cardData.resources[cardData.resIndex]);
+            if (index == 1 && YooAssets.CheckResExist(resPath))
+            {
+                item.m_txtTips.visible = true;
+            }
+            else
+            {
+                item.m_txtTips.visible = false;
+            }
             item.m_c1.selectedIndex = cardData.starRewardsState.ContainsKey(cardStarCfg.starLvl) ? cardData.starRewardsState[cardStarCfg.starLvl] : 0;
 
             if (item.m_btnGet.data == null)

GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/ClothingSyntheticView.cs

@@ -203,7 +203,7 @@ namespace GFGGame
                 _selectedItemId = 0;
                 UpdateClothingList(true);
                 LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.FU_ZHUANG_HE_CHENG, 2);
-                //Timers.inst.AddUpdate(CheckGuide);
+                Timers.inst.AddUpdate(CheckGuide);
                 // 发送服装合成成功事件
                 EventAgent.DispatchEvent(ConstMessage.CLOTHING_SYNTHETIC_SUCCESS);
                 EventAgent.DispatchEvent(ConstMessage.STUDIO_FILING_UPDATE);

GameClient/Assets/Game/HotUpdate/Views/CommonGame/GetSuitItemVIew.cs

@@ -99,6 +99,7 @@ namespace GFGGame
             {
                 Hide();
                 EventAgent.DispatchEvent(ConstMessage.LUCKY_BOX_SHOW_VIEW_CLOSE);
+                EventAgent.DispatchEvent(ConstMessage.LUCKY_BOX_ANIMATION_WAIT);
             }
         }
 

GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/DailyWelfareView.cs

@@ -52,6 +52,7 @@ namespace GFGGame
             _ui.m_comList.m_btnSevenDayLogin.target.onClick.Add(OnBtnSevenDayLoginClick);
             _ui.m_comList.m_btnSign.target.onClick.Add(OnBtnSignClick);
             _ui.m_comList.m_btnSupply.target.onClick.Add(OnBtnSupplyClick);
+            _ui.m_comList.m_btnGrowthFund.target.onClick.Add(OnBtnGrowthFundClick);
 
         }
         protected override void AddEventListener()
@@ -69,6 +70,7 @@ namespace GFGGame
 
             _ui.m_comList.m_btnSevenDayLogin.target.visible = !(!FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(SevenDayLoginView).Name, false)
             || ActivityDataManager.Instance.AllSevenDayBonusGot());
+            _ui.m_comList.m_btnGrowthFund.target.visible = false;//(RoleDataManager.lvl >=20 && ShopDataManager.Instance.GrowthFundRewardList.Count < GrowthFundCfgArray.Instance.dataArray.Length);
 
             _limitChargeInfo = ActivityGlobalDataManager.Instance.GetActivityInfoByType(ActivityType.XSLC);
             if (ActivityGlobalDataManager.Instance.GetActivityInfoByType(ActivityType.OpenServerCharge).Count > 0)
@@ -180,6 +182,10 @@ namespace GFGGame
         {
             ViewManager.Show<DailySupplyView>();
         }
+        private void OnBtnGrowthFundClick()
+        {
+            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_MONTH_CARD, ConstStoreSubId.STORE_GROWTH_FUND });
+        }
         private void UpdateRedDot()
         {
             for (int i = 0; i < _limitChargeInfo.Count; i++)

GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/ReDailySignTipsView.cs

@@ -77,7 +77,7 @@ namespace GFGGame
             hasNum = ItemDataManager.GetItemNum(FirstCost[0][0]);
             if(hasNum >= FirstCost[0][1])
             {
-                _ui.m_txtTips.text = string.Format("是否确定花费{0}{1}补签？", FirstCost[0][1], ItemCfgArray.Instance.GetCfg(FirstCost[0][0]).name);
+                _ui.m_txtTips.text = string.Format("是否花费{0}进行一次补签？",ItemCfgArray.Instance.GetCfg(FirstCost[0][0]).name);
                 type = 1;
                 itemId = FirstCost[0][0];
                 needNum = FirstCost[0][1];
@@ -88,9 +88,10 @@ namespace GFGGame
                 itemId = SecondCost[0][0];
                 needNum = SecondCost[0][1];
                 hasNum = ItemDataManager.GetItemNum(SecondCost[0][0]);
-                _ui.m_txtTips.text = string.Format("{0}不足，是否确定花费{1}{2}补签？", ItemCfgArray.Instance.GetCfg(SecondCost[0][0]).name, SecondCost[0][1], ItemCfgArray.Instance.GetCfg(SecondCost[0][0]).name);
+                _ui.m_txtTips.text = string.Format("{0}不足，是否花费{1}{2}进行一次补签？", ItemCfgArray.Instance.GetCfg(FirstCost[0][0]).name, SecondCost[0][1], ItemCfgArray.Instance.GetCfg(SecondCost[0][0]).name);
+                _ui.m_comCostItem.visible = false;
             }
-            ItemUtil.UpdateItemNumAndNeedNum(_ui.m_comCostItem, itemId, needNum, true);
+            ItemUtil.UpdateItemAndNeed(_ui.m_comCostItem, itemId, needNum, true);
         }
         private void OnClickBtnCancel()
         {

GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/SevenDayLoginView.cs

@@ -48,14 +48,20 @@ namespace GFGGame
             _cfgs = DailyLoginCfgArray.Instance.GetCfgsBytype((int)ConstBonusType.Item);
             _cfg = DailyLoginCfgArray.Instance.GetCfgsBytype((int)ConstBonusType.Suit)[0];
             UpdateView();
-            _ui.m_comIcon.m_loaIcon.url = "ui://DailyWelfare/yzhd_dyt_5";
             _ui.m_comIcon.m_loaIcon.data = _cfg;
             GameGlobal.AutoSevenDayLoginView = false;
         }
         private void UpdateView()
         {
             _ui.m_list.numItems = _cfgs.Count;
-
+            if (ActivityDataManager.Instance.sevenDayLoginBonusStatusList[_cfg.id - 1] != ConstBonusStatus.GOT)
+            {
+                _ui.m_comIcon.m_loaIcon.url = "ui://DailyWelfare/yzhd_dyt_5";
+            }
+            else
+            {
+                _ui.m_comIcon.m_loaIcon.url = "ui://DailyWelfare/yzhd_dyt_5_zz";
+            }
             RedDotController.Instance.SetComRedDot(_ui.m_comIcon.target, ActivityDataManager.Instance.sevenDayLoginBonusStatusList[_cfg.id - 1] == ConstBonusStatus.CAN_GET);
         }
         protected override void OnHide()

GameClient/Assets/Game/HotUpdate/Views/InstanceZones/InstanceZonesView.cs

@@ -183,6 +183,10 @@ namespace GFGGame
             GuideController.TryGuide(_ui.m_btnArena.target, ConstGuideId.ARENA_OPEN, 3, "在这里可以与其他小伙伴比拼搭配哦~");
             GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.ENTER_CHAPTER_5, 1, "", -1, false);
             GuideController.TryGuide(_ui.m_btnField.target, "TimeTracingShowView", 3, "合成副本可获得奖励和服装哦~");
+            if (!ArenaDataManager.Instance.IsSeasonOpen)
+            {
+                GuideController.TryCompleteGuide(ConstGuideId.ARENA_OPEN, 3);
+            }
         }
         private void PreloadSuitModel()
         {

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

@@ -131,7 +131,7 @@ namespace GFGGame
             {
                 _dressUpObj = new DressUpObj();
             }
-
+            
             CreateHeadImg();
             _speedAutoPlay = FightDataManager.Instance.dialogSpeed;
             lastTextFieldType = "";
@@ -149,7 +149,7 @@ namespace GFGGame
             IsTeaParty = (bool)datas[4];
             _autoPlay = _lastStartAutoPlay;
 
-            //修改需求，所有关卡打开跳过（第一关除外）
+            //修改需求，所有关卡打开跳过（第一关除外）dd
             skipable = true;
             if (MainStoryDataManager.currentLevelCfgId == 100001001 && !InstanceZonesDataManager.CheckLevelPass(MainStoryDataManager.currentLevelCfgId))
             {

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

@@ -228,7 +228,7 @@ namespace GFGGame
                 _ui.m_comCostCurrent.visible = true;
                 _ui.m_btnBg.url = "ui://Main/zx_jq_dituditu";
                 UI_ComCostCurrency com = UI_ComCostCurrency.Proxy(_ui.m_comCostCurrent);
-                com.m_c1.selectedIndex = 2;
+                com.m_c1.selectedIndex = 3;
                 UpdateVisitNum();
                 UI_ComCostCurrency.ProxyEnd();
             }

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

@@ -141,11 +141,11 @@ namespace GFGGame
             }
             _ui.m_comResult.m_t0.Play(AddExp);
 
-            StoryLevelCfg storylevel = StoryLevelCfgArray.Instance.GetCfg(MainStoryDataManager.currentLevelCfgId);
+            StoryLevelCfg storylevel = StoryLevelCfgArray.Instance.GetCfg(InstanceZonesDataManager.currentLevelCfgId);
             if (_resultData.Result && storylevel.type == 6 && storylevel.subType == 2)
             {
-                //await TimeTracingSProxy.ReqGetMaxLevelInfo(TimeTracingDataManager._currentChapterId);
-                await TimeTracingSProxy.ReqGetAppointLevelRewardStatus(TimeTracingDataManager._currentChapterId);
+                await TimeTracingSProxy.ReqGetMaxLevelInfo(TimeTracingDataManager._currentChapterId);
+                await TimeTracingSProxy.ReqGetAppointLevelRewardStatus(InstanceZonesDataManager.currentLevelCfgId);
                 await TimeTracingSProxy.ReqGetSuitRewardStatus();
             }
         }

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

@@ -1138,7 +1138,7 @@ namespace GFGGame
             if (redPointUpdateFrame == 18)
             {
                 RedDotController.Instance.SetComRedDot(_ui.m_btnHaiZhiShi.target, RedDotDataManager.Instance.GetTravelRed() 
-                    ||RedDotDataManager.Instance.GetFieldRed(), "icon_tanhao", -39, 15);
+                    || TimeTracingDataManager.Instance.GetLevelRewardStatus() || TimeTracingDataManager.Instance.GetAllChapterReward(), "icon_tanhao", -39, 15);
             }
 
             // 新春活动

GameClient/Assets/Game/HotUpdate/Views/Store/StoreGrowthFundView.cs

@@ -59,7 +59,7 @@ namespace GFGGame
         {
             base.OnShown();
             _valueBarController.OnShown();
-
+            _ui.m_txtDailyMoneyCount.text = "4800";
             UpdateView();
             UpdateRedDot();
         }
@@ -74,7 +74,7 @@ namespace GFGGame
         {
             base.RemoveEventListener();
             EventAgent.RemoveEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
-            EventAgent.RemoveEventListener(ConstMessage.RED_CHANGE, UpdateView);
+            EventAgent.RemoveEventListener(ConstMessage.SHOP_BUY, UpdateView);
         }
         private void OnBtnBlackRewardClick()
         {
@@ -104,6 +104,7 @@ namespace GFGGame
             {
                 int id = ActivityOpenCfgArray.Instance.GetCfg(3002).paramsArr[0];
                 ShopSProxy.ReqShopBuy(id).Coroutine();
+                ShopSProxy.ReqGetGrowthFundInfo().Coroutine();
             }
         }
         private async void OnBtnGetClick(EventContext context)
@@ -117,11 +118,9 @@ namespace GFGGame
             }
             UI_GrowthFundItemUI.ProxyEnd();
             bool result = await ShopSProxy.ReqGetGrowthFundReward(3002,goodsId);
-            if (result)
-            {
-                _ui.m_list.numItems = GrowthFundCfgArray.Instance.dataArray.Length;
-            }
+            _ui.m_list.numItems = GrowthFundCfgArray.Instance.dataArray.Length;
         }
+
         private void ListItemRenderer(int index, GObject obj)
         {
             UI_GrowthFundItemUI item = UI_GrowthFundItemUI.Proxy(obj);

GameClient/Assets/Game/HotUpdate/Views/Store/StoreSummerGiftView.cs

@@ -0,0 +1,264 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using ET;
+using FairyGUI;
+using UI.Store;
+using UI.CommonGame;
+using UnityEngine;
+using static GFGGame.ShopSProxy;
+
+namespace GFGGame
+{
+    class StoreSummerGiftView : BaseWindow
+    {
+        private UI_StoreSummerGiftUI _ui;
+
+        private List<CoolDownCfg> _rewardCfgs;
+        private ActivityOpenCfg activityOpenCfg;
+
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_StoreSummerGiftUI.PACKAGE_NAME;
+            _ui = UI_StoreSummerGiftUI.Create();
+            viewCom = _ui.target;
+            isfullScreen = true;
+            clickBlankToClose = false;
+
+            _ui.m_btnOpen.onClick.Add(OnBtnOpenClick);
+            _ui.m_btnGetAll.onClick.Add(OnBtnGetAllClick);
+            _ui.m_RewardList.itemRenderer = ListBoxRewardItemRender;
+
+            //_ui.m_tip.onClick.Add(RuleController.ShowRuleView);
+            //_ui.m_tip.data = 300012;
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+            Timers.inst.Remove(UpdateTime);
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+            activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(ActivityAfuGiftDataManager.Instance.SummerActivityID);
+            FreshReward();
+            Timers.inst.AddUpdate(UpdateTime);
+        }
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+            //监听通行证等级变化
+            EventAgent.AddEventListener(ConstMessage.SHOP_BUY, SetBuyBtnStatus);
+            EventAgent.AddEventListener(ConstMessage.NUMERIC_CHANGE, FreshReward);
+        }
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.SHOP_BUY, SetBuyBtnStatus);
+            EventAgent.RemoveEventListener(ConstMessage.NUMERIC_CHANGE, FreshReward);
+        }
+        //购买礼包
+        private async void OnBtnOpenClick(EventContext context)
+        {
+            if(GetBuyStatus())
+            {
+                return;
+            }
+            await ReqShopBuy(activityOpenCfg.paramsArr[0]);
+            await ActivityAfuGiftSProxy.GetSummerGiftInfo();
+            _ui.m_RewardList.numItems = _rewardCfgs.Count;
+        }
+
+        //领取全部奖励
+        private async void OnBtnGetAllClick(EventContext context)
+        {
+            if(!ActivityAfuGiftDataManager.Instance.GetSummerGiftRewardAllState())
+            {
+                return;
+            }
+            await ActivityAfuGiftSProxy.ReqGetSummerGiftAllReward();
+            _ui.m_RewardList.numItems = _rewardCfgs.Count;
+        }
+
+        private void ListBoxRewardItemRender(int index, GObject obj)
+        {
+            var item = UI_BrocadeWeavRewardItem.Proxy(obj);
+            var level = index;
+            var battlePassCfg = _rewardCfgs[level];
+            item.m_Level.text = (index + 1).ToString();
+            //设置奖励
+            var bonusNormalArr = battlePassCfg.bonusFreeArr;
+            if (bonusNormalArr != null && bonusNormalArr.Length > 0)
+            {
+                item.m_NormalReward.visible = true;
+                ItemCfg itemNormal = ItemCfgArray.Instance.GetCfg(bonusNormalArr[0][0]);
+                UI_ComItem comItem = UI_ComItem.Proxy(item.m_NormalReward);
+                comItem.m_loaIcon.url = ResPathUtil.GetIconPath(itemNormal);
+                comItem.m_txtCount.text = bonusNormalArr[0][1].ToString();
+                comItem.m_QualityType.selectedIndex = itemNormal.rarity - 1;
+                if (index <= ActivityAfuGiftDataManager.Instance.SummerGiftRewardState[0].Count)
+                {
+                    if (ActivityAfuGiftDataManager.Instance.SummerGiftRewardState[0][index] == 2)
+                    {
+                        comItem.m_grpGot.visible = true;
+                    }
+                    else
+                    {
+                        comItem.m_grpGot.visible = false;
+                    }
+                }
+                else
+                {
+                    comItem.m_grpGot.visible = false;
+                }
+                if (comItem.target.data == null)
+                {
+                    comItem.target.onClick.Add(OnItemClick);
+                }
+                comItem.target.data = new List<int>() { 0, index, bonusNormalArr[0][0] };
+                if (index <= ActivityAfuGiftDataManager.Instance.SummerGiftRewardState[0].Count)
+                {
+                    RedDotController.Instance.SetComRedDot(item.m_NormalReward, ActivityAfuGiftDataManager.Instance.SummerGiftRewardState[0][index] == 1, "", -12, 24);
+                }
+                UI_ComItem.ProxyEnd();
+            }
+            else
+            {
+                item.m_NormalReward.data = null;
+                item.m_NormalReward.visible = false;
+            }
+            if (item.m_RewardList.data == null)
+            {
+                item.m_RewardList.itemRenderer = SpecialRewardRender;
+            }
+            item.m_RewardList.data = _rewardCfgs[index];
+            item.m_RewardList.numItems = battlePassCfg.bonusPayArr.Length;
+
+            UI_BrocadeWeavRewardItem.ProxyEnd();
+        }
+        private void SpecialRewardRender(int index, GObject obj)
+        {
+            var keyValuePair = (CoolDownCfg)obj.parent.data;
+            var itemInfo = keyValuePair.bonusPayArr;
+            int day = keyValuePair.num - 1;
+            ItemCfg itemNormal = ItemCfgArray.Instance.GetCfg(itemInfo[index][0]);
+            UI_ComItem comItem = UI_ComItem.Proxy(obj);
+            comItem.m_loaIcon.url = ResPathUtil.GetIconPath(itemNormal);
+            comItem.m_txtCount.text = itemInfo[index][1].ToString();
+            comItem.m_QualityType.selectedIndex = itemNormal.rarity - 1;
+            if (day <= ActivityAfuGiftDataManager.Instance.SummerGiftRewardState[1].Count)
+            {
+                if (ActivityAfuGiftDataManager.Instance.SummerGiftRewardState[1][day] == 2)
+                {
+                    comItem.m_grpGot.visible = true;
+                }
+                else
+                {
+                    comItem.m_grpGot.visible = false;
+                }
+            }
+            if (comItem.target.data == null)
+            {
+                comItem.target.onClick.Add(OnItemClick);
+            }
+            comItem.target.data = new List<int>() {1, day, itemInfo[index][0] };
+            if (day <= ActivityAfuGiftDataManager.Instance.SummerGiftRewardState[1].Count)
+            {
+                RedDotController.Instance.SetComRedDot(comItem.target, ActivityAfuGiftDataManager.Instance.SummerGiftRewardState[1][day] == 1, "", -12, 24);
+            }
+            UI_ComItem.ProxyEnd();
+        }
+        private void OnItemClick(EventContext eventContext)
+        {
+            GObject sender = eventContext.sender as GObject;
+            List<int> info = (List<int>)sender.data;
+            if(info[1] <= ActivityAfuGiftDataManager.Instance.SummerGiftRewardState[info[0]].Count)
+            {
+                if (ActivityAfuGiftDataManager.Instance.SummerGiftRewardState[info[0]][info[1]] == 1)
+                {
+                    if(info[0] == 0)
+                    {
+                        ActivityAfuGiftSProxy.ReqGetSummerGiftReward(false,info[1] + 1).Coroutine();
+                    }
+                    else
+                    {
+                        ActivityAfuGiftSProxy.ReqGetSummerGiftReward(true,info[1] + 1).Coroutine();
+                    }  
+                    _ui.m_RewardList.numItems = _rewardCfgs.Count;
+                    RedDotController.Instance.SetComRedDot(_ui.m_btnGetAll, ActivityAfuGiftDataManager.Instance.GetSummerGiftRewardAllState(), "");
+                }
+                else
+                {
+                    GoodsItemTipsController.ShowItemTips(info[2]);
+                }
+            }
+        }
+        private void UpdateTime(object param)
+        {
+            long curTime = TimeHelper.ServerNow();
+            var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(ActivityAfuGiftDataManager.Instance.SummerActivityID);
+            if (activityInfo != null)
+            {
+                long endTime = activityInfo.EndTime;
+                _ui.m_LeftTime.text = TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime);
+            }
+            else
+            {
+                _ui.m_LeftTime.text = "";
+            }
+        }
+        private void FreshReward()
+        {
+            //刷新奖励列表
+            _rewardCfgs = CoolDownCfgArray.Instance.dataArray.ToList();
+            //去掉第一个为0的配置
+            _ui.m_RewardList.numItems = _rewardCfgs.Count;
+            SetBuyBtnStatus();
+        }
+
+        private void SetBuyBtnStatus(EventContext context = null)
+        {
+            //通行证是否购买
+            ShopCfg shopCfg = ShopCfgArray.Instance.GetCfg(activityOpenCfg.paramsArr[0]);
+            int buyNum = ShopDataManager.Instance.GetGoodsBuyNumById(shopCfg.id);
+            if (shopCfg.maxBuyNum == 0 || buyNum < shopCfg.maxBuyNum)
+            {
+                _ui.m_btnOpen.text = "¥ 68 解 锁";
+                _ui.m_btnGetAll.visible = false;
+            }
+            else
+            {
+                _ui.m_btnOpen.text = "已解锁";
+                _ui.m_btnGetAll.visible = true;
+            }
+            RedDotController.Instance.SetComRedDot(_ui.m_btnGetAll, ActivityAfuGiftDataManager.Instance.GetSummerGiftRewardAllState(), "");
+        }
+        private bool GetBuyStatus()
+        {
+            //通行证是否购买
+            ShopCfg shopCfg = ShopCfgArray.Instance.GetCfg(activityOpenCfg.paramsArr[0]);
+            int buyNum = ShopDataManager.Instance.GetGoodsBuyNumById(shopCfg.id);
+            if (shopCfg.maxBuyNum == 0 || buyNum < shopCfg.maxBuyNum)
+            {
+                return false;
+            }
+            else
+            {
+                return true;
+            }
+        }
+
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/Store/StoreSummerGiftView.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/Store/StoreView.cs

@@ -185,7 +185,7 @@ namespace GFGGame
             else
             {
                 //成长基金单独处理
-                if (_storeTabCfgs[index][0] == "成长基金")
+                if (_storeTabCfgs[index][2] == "StoreGrowthFundView")
                 {
                     ActivityOpenCfg activityCfg = ActivityOpenCfgArray.Instance.GetCfg(3002);
                     if (RoleDataManager.lvl < activityCfg.level)
@@ -200,6 +200,19 @@ namespace GFGGame
                         item.visible = true;
                     }
                 }
+                else if(_storeTabCfgs[index][2] == "StoreSummerGiftView")
+                {
+                    long curTime = TimeHelper.ServerNow();
+                    var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(ActivityAfuGiftDataManager.Instance.SummerActivityID);
+                    if (activityInfo == null)
+                    {
+                        item.visible = false;
+                    }
+                    else
+                    {
+                        item.visible = true;
+                    }
+                }
                 item.title = _storeTabCfgs[index][0];
                 menu2 = int.Parse(_storeTabCfgs[index][1]);
             }
@@ -238,6 +251,15 @@ namespace GFGGame
             ViewManager.Hide(_curViewName);
             if (!string.IsNullOrEmpty(viewName) && viewName != "“”")
             {
+                //特殊处理
+                if(viewName == "StoreSummerGiftView")
+                {
+                    _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("xrqlzl_bg");
+                }
+                else
+                {
+                    _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("bg_fhl");
+                }
                 ViewManager.Show("GFGGame." + viewName, menu2);
             }
             _curSubTabIndex = index;
@@ -280,12 +302,14 @@ namespace GFGGame
         private void UpdateStoreMonthRedDot()
         {
             RedDotController.Instance.SetComRedDot(_ui.m_comTab.m_btn1.target, RedDotDataManager.Instance.GetGoldCardRewardRed() || RedDotDataManager.Instance.GetBlackCardRewardRed() || RedDotDataManager.Instance.GetBlackCardClothingRed()
-                || RedDotDataManager.Instance.GetStoreBrocadeWeavRewardRed()||RedDotDataManager.Instance.GetGrowthFundRewardRed());
+                || RedDotDataManager.Instance.GetStoreBrocadeWeavRewardRed()||RedDotDataManager.Instance.GetGrowthFundRewardRed()|| ActivityAfuGiftDataManager.Instance.GetSummerGiftRewardAllState());
             if (_ui.m_comTab.m_c1.selectedIndex == ConstStoreTabId.STORE_MONTH_CARD)
             {
                 RedDotController.Instance.SetComRedDot(_ui.m_listSubTab.GetChildAt(ConstStoreSubId.STORE_MONTH_GOLD_CARD).asCom, RedDotDataManager.Instance.GetGoldCardRewardRed());
                 RedDotController.Instance.SetComRedDot(_ui.m_listSubTab.GetChildAt(ConstStoreSubId.STORE_MONTH_BLACK_CARD).asCom, RedDotDataManager.Instance.GetBlackCardRewardRed() || RedDotDataManager.Instance.GetBlackCardClothingRed());
                 RedDotController.Instance.SetComRedDot(_ui.m_listSubTab.GetChildAt(ConstStoreSubId.STORE_MONTH_BROCADE_WEAV).asCom, RedDotDataManager.Instance.GetStoreBrocadeWeavRewardRed());
+                RedDotController.Instance.SetComRedDot(_ui.m_listSubTab.GetChildAt(ConstStoreSubId.STORE_GROWTH_FUND).asCom, RedDotDataManager.Instance.GetGrowthFundRewardRed());
+                RedDotController.Instance.SetComRedDot(_ui.m_listSubTab.GetChildAt(4).asCom, ActivityAfuGiftDataManager.Instance.GetSummerGiftRewardAllState());
             }
         }
 

GameClient/Assets/Game/HotUpdate/Views/Store/StoreZGDCView.cs

@@ -318,11 +318,11 @@ namespace GFGGame
             {
                 ShopCfg shopcfg = ShopCfgArray.Instance.GetCfg(giftBagList[i]);
                 var item = EverydaySaleCfgArray.Instance.dataArray[i];
-                if (item.openTime == "" || item.openTime == null)
-                {
-                    shopCfgs.Add(shopcfg);
-                    break;
-                }
+                //if (item.openTime == "" || item.openTime == null)
+                //{
+                //    shopCfgs.Add(shopcfg);
+                //    break;
+                //}
                 if (IsDisountTime(item) || day_CreateRole >= item.id*2)
                 {
                     shopCfgs.Add(shopcfg);
@@ -332,7 +332,7 @@ namespace GFGGame
         }
         private bool IsDisountTime(EverydaySaleCfg item)
         {
-            if(item.activityId == 6002 && item.openTime == "")
+            if(item.activityId == 6002)
             {
                 return ActivityGlobalDataManager.Instance.IsActivityOpen(item.activityId);
             }
@@ -361,12 +361,12 @@ namespace GFGGame
             int count = 0;
             foreach (var item in EverydaySaleCfgArray.Instance.dataArray)
             {
-                if(item.activityId == 6002)
-                {
-                    listIndex.Add(giftBagList[count]);
-                    count++;
-                    break;
-                }
+                //if (item.activityId == 6002)
+                //{
+                //    listIndex.Add(giftBagList[count]);
+                //    count++;
+                //    break;
+                //}
                 if (IsDisountTime(item))
                 {
                     listIndex.Add(giftBagList[count]);

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioFabricView.cs

@@ -33,7 +33,7 @@ namespace GFGGame
             list.ScrollToView(curIndex);
             base.OnShown();
 
-            com.GetChild("loaBg").asLoader.url = ResPathUtil.GetBgImgPath("gzs_fb_bg");
+            com.GetChild("loaBg").asLoader.url = ResPathUtil.GetBgImgPath("gzs_fb_bj");
             com.GetChild("Name").asLoader.url = "ui://Studio/gzs_fb_bt_zwxf";
             com.GetChild("btnChageLine").asLoader.url = ResPathUtil.GetCommonGameResPath("zsx_fl");
             com.height = _ui.target.height;

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioFilingView.cs

@@ -42,7 +42,7 @@ namespace GFGGame
             isReturnView = true;
             _valueBarController = new ValueBarController(_ui.m_comValueBar);
 
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gzs_fb_bg");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gzs_fb_bj");
             _ui.m_btnChageLine.url = ResPathUtil.GetCommonGameResPath("zsx_fl");
 
             _ui.m_list.itemRenderer = RenderListItem;

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioMetalView.cs

@@ -33,7 +33,7 @@ namespace GFGGame
             list.numItems = this.storyLevelCfgs.Count;
             list.ScrollToView(curIndex);
 
-            com.GetChild("loaBg").asLoader.url = ResPathUtil.GetBgImgPath("gzs_fb_bg");
+            com.GetChild("loaBg").asLoader.url = ResPathUtil.GetBgImgPath("gzs_fb_bj");
             com.GetChild("Name").asLoader.url = "ui://Studio/gzs_fb_bt_jsxf";
             com.GetChild("btnChageLine").asLoader.url = ResPathUtil.GetCommonGameResPath("zsx_fl");
 

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioPorcelainView.cs

@@ -31,7 +31,7 @@ namespace GFGGame
         {
             _comPorcelain = UIPackage.CreateObject(UI_StudioUI.PACKAGE_NAME, "ComPorcelain").asCom;
             AddChildCom(_comPorcelain);
-            _comPorcelain.GetChild("loaBg").asLoader.url = ResPathUtil.GetBgImgPath("gzs_fb_bg");
+            _comPorcelain.GetChild("loaBg").asLoader.url = ResPathUtil.GetBgImgPath("gzs_fb_bj");
 
             StudioDataManager.Instance.VIEW_NAME = typeof(StudioPorcelainView).FullName;
             this._studioCfg = StudioCfgArray.Instance.GetCfgsByfunId(typeof(StudioPorcelainView).Name)[StudioDataManager.Instance.PorcelainTheme - 1];

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioPropertyView.cs

@@ -44,7 +44,7 @@ namespace GFGGame
             list.itemRenderer = ListItemRender;
             _croProperty.onChanged.Add(OnControllerChange);
 
-            _bg0.url = ResPathUtil.GetBgImgPath("gzs_fb_bg");
+            _bg0.url = ResPathUtil.GetBgImgPath("gzs_fb_bj");
             //_bg1.url = "ui://Studio/lm_db_chang_2";
             _btnChageLine.url = ResPathUtil.GetCommonGameResPath("zsx_fl");
             

GameClient/Assets/Game/HotUpdate/Views/TimeTracing/TimeTracingLevelView.cs

@@ -211,7 +211,15 @@ namespace GFGGame
                 //}
                 item.m_c1.selectedIndex = TimeTracingDataManager.Instance.GetChapterRewardIDStatus(datas[i].id, datas[i].paramsArr[0]);
                 RedDotController.Instance.SetComRedDot(item.target, TimeTracingDataManager.Instance.GetChapterRewardIDStatus(datas[i].id, datas[i].paramsArr[0]) == 1, "", -10, 25);
-                item.m_icon.url = ResPathUtil.GetIconPath(ItemCfgArray.Instance.GetCfg(datas[i].bonusArr[0][0]).res, "png");
+                ItemCfg itemcfg = ItemCfgArray.Instance.GetCfg(datas[i].bonusArr[0][0]);
+                if(itemcfg.itemType == ConstItemType.HEAD)
+                {
+                    item.m_icon.url = ResPathUtil.GetHeadBorderPath(itemcfg.res);
+                }
+                else
+                {
+                    item.m_icon.url = ResPathUtil.GetIconPath(itemcfg.res, "png");
+                }        
                 item.m_count.text = datas[i].count.ToString();
                 if (item.target.data == null)
                 {
@@ -267,8 +275,8 @@ namespace GFGGame
         protected void UpdateCheckGuide(object param)
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-            MainStoryDataManager.currentLevelCfgId = 100003003;
-            GuideController.TryGuide(_ui.m_level1.target, "TimeTracingShowView", 5, "挑战。");       
+            GuideController.TryGuide(_ui.m_level1.target, "TimeTracingShowView", 5, "挑战。",-1,true,0,false,false,true);
+            GuideController.TryGuide(_ui.m_btnBack, "TimeTracingShowView", 6, "返回。", -1, true, 0, false, false, true);
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/TimeTracing/TimeTracingShowView.cs

@@ -156,9 +156,15 @@ namespace GFGGame
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
             GuideController.TryGuide(_ui.m_challgeBtn, "TimeTracingShowView", 4, "进入副本。");
-            GuideController.TryGuide(_ui.m_switchBtn.target, "TimeTracingShowView", 6, "点击选择副本。");
-            GuideController.TryGuide(_ui.m_btnBack, "TimeTracingShowView", 7, "点击返回。");
-            GuideController.TryCompleteGuide("TimeTracingShowView", 7);
+            GuideController.TryGuide(_ui.m_switchBtn.target, "TimeTracingShowView", 7, "点击选择副本。", -1, true, 0, false, false, true);
+            GuideController.TryGuide(_ui.m_makeSuitBtn.target, "TimeTracingShowView", 10, "前往合成套装。", -1, true, 0, false, false, true);
+            GuideController.TryCompleteGuide("TimeTracingShowView", 10);
+        }
+        protected override void TryCompleteGuide()
+        {
+            base.TryCompleteGuide();
+            GuideController.TryCompleteGuideIndex("TimeTracingShowView", 10);
+            GuideController.TryCompleteGuide("TimeTracingShowView", 10);
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/TimeTracing/TimeTracingSwitchView.cs

@@ -46,10 +46,12 @@ namespace GFGGame
                 }
             }
             DoSpecialEffect();
+            Timers.inst.AddUpdate(CheckGuide);
         }
 
         protected override void OnHide()
         {
+            Timers.inst.Remove(CheckGuide);
             base.OnHide();
         }
 
@@ -192,5 +194,20 @@ namespace GFGGame
                 //item.y = -_ui.m_List.height * distanceX;
             }
         }
+        private void CheckGuide(object param)
+        {
+            GRoot.inst.touchable = true;
+            if (GuideDataManager.IsGuideFinish("TimeTracingShowView") <= 0)
+                UpdateCheckGuide(null);
+            else
+                Timers.inst.Remove(CheckGuide);
+        }
+
+        protected void UpdateCheckGuide(object param)
+        {
+            if (!ViewManager.CheckIsTopView(this.viewCom)) return;
+            GuideController.TryGuide(null, "TimeTracingShowView", 8, "集齐前一套装可前往合成下一套。", - 1, true, 0, false, false, true);
+            GuideController.TryGuide(_ui.m_btnBack, "TimeTracingShowView", 9, "点击返回。", -1, true, 0, false, false, true);
+        }
     }
 }