月卡，画廊，卡牌，的引导。合成副本

GameClient/Assets/Game/HotUpdate/Constant/ConstGuideId.cs

@@ -49,5 +49,9 @@ namespace GFGGame
         public const string LUCKY_BOX_LINE = "LUCKY_BOX_LINE";
         public const string BUY_POWER = "BUY_POWER";
 
+        public const string CARD_HECHENG = "CARD_HECHENG";
+        public const string HUALANG_TOUGAO = "HUALANG_TOUGAO";
+        public const string SHEZHI_ZHUJIEMBG = "SHEZHI_ZHUJIEMBG";
+
     }
 }

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

@@ -0,0 +1,16 @@
+using System.Collections.Generic;
+using System.Linq;
+using ET;
+using FairyGUI;
+
+namespace GFGGame
+{
+    //用于引导的模拟数据
+    public class GuideSimulationDataManager : SingletonBase<GuideSimulationDataManager>
+    {
+        //引导背景特权
+        //1:从商店进入
+        //2:从设置进入
+        public int GuideMonthlyJumpType = 0;
+    }
+}

GameClient/Assets/Game/HotUpdate/Data/GuideSimulationDataManager.cs.meta

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

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

@@ -22,8 +22,16 @@ namespace GFGGame
         //关卡信息
         public static Dictionary<int, Dictionary<int, LevelRoleInfoProto>> _LevelMaxInfoDic = new Dictionary<int, Dictionary<int, LevelRoleInfoProto>>();
 
-        public SuitCollectRankProto mySuitRankInfo;
-        public LevelRankProto myLevelRankInfo;
+        public Dictionary<int, SuitCollectRankProto> mySuitRankInfo = new Dictionary<int, SuitCollectRankProto>()
+        {
+            {0,new SuitCollectRankProto()},
+            {1,new SuitCollectRankProto()},
+        };
+        public Dictionary<int, LevelRankProto> myLevelRankInfo = new Dictionary<int, LevelRankProto>()
+        {
+            { 0,new LevelRankProto() },
+            { 1,new LevelRankProto() },
+        };
         //套装排行榜数据
         public Dictionary<int, List<SuitCollectRankProto>> SuitRankDatasDic = new Dictionary<int, List<SuitCollectRankProto>>()
         {

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

@@ -14,6 +14,7 @@ namespace UI.Main
         public UI_ComponentHeadBar m_headBar;
         public GButton m_btnYouJian;
         public GButton m_btnGongGao;
+        public GButton m_guideBtn;
         public UI_Button6 m_storageBtn;
         public UI_ButtonChange m_btnChange;
         public GList m_list;
@@ -107,6 +108,7 @@ namespace UI.Main
             m_headBar = (UI_ComponentHeadBar)UI_ComponentHeadBar.Create(comp.GetChild("headBar"));
             m_btnYouJian = (GButton)comp.GetChild("btnYouJian");
             m_btnGongGao = (GButton)comp.GetChild("btnGongGao");
+            m_guideBtn = (GButton)comp.GetChild("guideBtn");
             m_storageBtn = (UI_Button6)UI_Button6.Create(comp.GetChild("storageBtn"));
             m_btnChange = (UI_ButtonChange)UI_ButtonChange.Create(comp.GetChild("btnChange"));
             m_list = (GList)comp.GetChild("list");
@@ -157,6 +159,7 @@ namespace UI.Main
             m_headBar = null;
             m_btnYouJian = null;
             m_btnGongGao = null;
+            m_guideBtn = null;
             m_storageBtn.Dispose();
             m_storageBtn = null;
             m_btnChange.Dispose();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_RoleInfoUI.cs

@@ -25,6 +25,7 @@ namespace UI.RoleInfo
         public UI_ButtonCollectProgress m_btnSuitGuide;
         public UI_ButtonCollectProgress m_btnCardGuide;
         public UI_ButtonCollectProgress m_btnTaskArchieveGuide;
+        public GButton m_btnExchange;
         public GList m_badgeList;
         public GGroup m_center;
         public GList m_photoList;
@@ -100,6 +101,7 @@ namespace UI.RoleInfo
             m_btnSuitGuide = (UI_ButtonCollectProgress)UI_ButtonCollectProgress.Create(comp.GetChild("btnSuitGuide"));
             m_btnCardGuide = (UI_ButtonCollectProgress)UI_ButtonCollectProgress.Create(comp.GetChild("btnCardGuide"));
             m_btnTaskArchieveGuide = (UI_ButtonCollectProgress)UI_ButtonCollectProgress.Create(comp.GetChild("btnTaskArchieveGuide"));
+            m_btnExchange = (GButton)comp.GetChild("btnExchange");
             m_badgeList = (GList)comp.GetChild("badgeList");
             m_center = (GGroup)comp.GetChild("center");
             m_photoList = (GList)comp.GetChild("photoList");
@@ -134,6 +136,7 @@ namespace UI.RoleInfo
             m_btnCardGuide = null;
             m_btnTaskArchieveGuide.Dispose();
             m_btnTaskArchieveGuide = null;
+            m_btnExchange = null;
             m_badgeList = null;
             m_center = null;
             m_photoList = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_SettingUI.cs

@@ -9,6 +9,7 @@ namespace UI.RoleInfo
         public GComponent target;
         public Controller m_c1;
         public GLoader m_loaBg;
+        public GImage m_iconBg;
         public GLoader m_icon;
         public GList m_settingTypeList;
         public GButton m_btnExit;
@@ -77,6 +78,7 @@ namespace UI.RoleInfo
         {
             m_c1 = comp.GetController("c1");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_iconBg = (GImage)comp.GetChild("iconBg");
             m_icon = (GLoader)comp.GetChild("icon");
             m_settingTypeList = (GList)comp.GetChild("settingTypeList");
             m_btnExit = (GButton)comp.GetChild("btnExit");
@@ -101,6 +103,7 @@ namespace UI.RoleInfo
         {
             m_c1 = null;
             m_loaBg = null;
+            m_iconBg = null;
             m_icon = null;
             m_settingTypeList = null;
             m_btnExit = null;

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

@@ -25,6 +25,7 @@ namespace UI.Store
         public UI_StoreMonthList m_storeMonthList;
         public GButton m_btnBlackReward;
         public GGraph m_holderfEff;
+        public GButton m_guideBackBtn;
         public const string URL = "ui://p9mtgheoqik1tc0";
         public const string PACKAGE_NAME = "Store";
         public const string RES_NAME = "StoreMonthUI";
@@ -90,6 +91,7 @@ namespace UI.Store
             m_storeMonthList = (UI_StoreMonthList)UI_StoreMonthList.Create(comp.GetChild("storeMonthList"));
             m_btnBlackReward = (GButton)comp.GetChild("btnBlackReward");
             m_holderfEff = (GGraph)comp.GetChild("holderfEff");
+            m_guideBackBtn = (GButton)comp.GetChild("guideBackBtn");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -113,6 +115,7 @@ namespace UI.Store
             m_storeMonthList = null;
             m_btnBlackReward = null;
             m_holderfEff = null;
+            m_guideBackBtn = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_PoemGalleryUI.cs

@@ -15,6 +15,9 @@ namespace UI.Poem
         public GButton m_btnRecover;
         public GButton m_btnJoin;
         public GButton m_btnFavorites;
+        public GButton m_guideBtn1;
+        public GButton m_guideBtn2;
+        public GButton m_guideBtn3;
         public const string URL = "ui://iyz778gkr9ri10u";
         public const string PACKAGE_NAME = "Poem";
         public const string RES_NAME = "PoemGalleryUI";
@@ -70,6 +73,9 @@ namespace UI.Poem
             m_btnRecover = (GButton)comp.GetChild("btnRecover");
             m_btnJoin = (GButton)comp.GetChild("btnJoin");
             m_btnFavorites = (GButton)comp.GetChild("btnFavorites");
+            m_guideBtn1 = (GButton)comp.GetChild("guideBtn1");
+            m_guideBtn2 = (GButton)comp.GetChild("guideBtn2");
+            m_guideBtn3 = (GButton)comp.GetChild("guideBtn3");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -83,6 +89,9 @@ namespace UI.Poem
             m_btnRecover = null;
             m_btnJoin = null;
             m_btnFavorites = null;
+            m_guideBtn1 = null;
+            m_guideBtn2 = null;
+            m_guideBtn3 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -140,7 +140,7 @@ namespace GFGGame
             S2C_GetSuitCollectRankList response = (S2C_GetSuitCollectRankList)await MessageHelper.SendToServer(new C2S_GetSuitCollectRankList { SuitId = suitID });
             TimeTracingDataManager.Instance.SuitRankDatasDic[0] = response.SuitCollectRankList;
             TimeTracingDataManager.RefreshTime = response.NexTime;
-            TimeTracingDataManager.Instance.mySuitRankInfo = response.MySuitCollectRank;
+            TimeTracingDataManager.Instance.mySuitRankInfo[0] = response.MySuitCollectRank;
             return true;
         }
         //获取套装好友排名榜数据
@@ -149,6 +149,7 @@ namespace GFGGame
             TimeTracingDataManager.Instance.SuitRankDatasDic[1].Clear();
             S2C_GetFriendSuitCollectRankList response = (S2C_GetFriendSuitCollectRankList)await MessageHelper.SendToServer(new C2S_GetFriendSuitCollectRankList { SuitId = suitID });
             TimeTracingDataManager.Instance.SuitRankDatasDic[1] = response.FriendSuitCollectRankList;
+            TimeTracingDataManager.Instance.mySuitRankInfo[1] = response.MySuitCollectRank;
             return true;
         }
         //获取关卡排行榜信息
@@ -158,7 +159,7 @@ namespace GFGGame
             S2C_GetInstanceZonesRankList response = (S2C_GetInstanceZonesRankList)await MessageHelper.SendToServer(new C2S_GetInstanceZonesRankList { LevelCfgId = levelID });
             TimeTracingDataManager.Instance.LevelRankDatasDic[0] = response.LevelRankList;
             TimeTracingDataManager.RefreshTime = response.NexTime;
-            TimeTracingDataManager.Instance.myLevelRankInfo = response.MyLevelRankInfo;
+            TimeTracingDataManager.Instance.myLevelRankInfo[0] = response.MyLevelRankInfo;
             return true;
         }
         //获取关卡好友排行榜数据
@@ -167,6 +168,7 @@ namespace GFGGame
             TimeTracingDataManager.Instance.LevelRankDatasDic[1].Clear();
             S2C_GetInstanceZonesFriendRankList response = (S2C_GetInstanceZonesFriendRankList)await MessageHelper.SendToServer(new C2S_GetInstanceZonesFriendRankList { LevelCfgId = levelID });
             TimeTracingDataManager.Instance.LevelRankDatasDic[1] = response.FriendLevelRankList;
+            TimeTracingDataManager.Instance.myLevelRankInfo[1] = response.MyLevelRank;
             return true;
         }
 

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

@@ -451,7 +451,8 @@ namespace GFGGame
         }
         private void CheckGuide(object param)
         {
-            if (GuideDataManager.IsGuideFinish(ConstGuideId.CLOTHING_SYNTHETIC) <= 0)
+            if (GuideDataManager.IsGuideFinish(ConstGuideId.CLOTHING_SYNTHETIC) <= 0 
+                || (GuideDataManager.IsGuideFinish(ConstGuideId.CARD_HECHENG) <= 0 && IsGetSuit()))
             {
                 UpdateToCheckGuide(null);
             }
@@ -490,6 +491,11 @@ namespace GFGGame
 
             GuideController.TryGuide(_ui.m_btnProduction, ConstGuideId.CLOTHING_SYNTHETIC, 5, "点击获得新的服饰。");
             GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.CLOTHING_SYNTHETIC, 6, "获得新衣服啦，继续通关主线剧情吧。");
+
+            GuideController.TryGuide(_ui.m_cardSyntheticBtn, ConstGuideId.CARD_HECHENG, 1, "领取卡牌。");
+            GuideController.TryGuide(_ui.m_cardSyntheticBtn, ConstGuideId.CARD_HECHENG, 2, "进行卡牌合成");
+            GuideController.TryCompleteGuideIndex(ConstGuideId.CARD_HECHENG, 2);
+            GuideController.TryCompleteGuide(ConstGuideId.CARD_HECHENG, 2);
         }
 
         /// <summary>
@@ -575,5 +581,16 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("集齐套装后可领取卡牌奖励");
             }  
         }
+        private bool IsGetSuit()
+        {
+            int count = 0;//套装当前拥有的部件数量
+            int totalCount = 1;
+            DressUpMenuSuitDataManager.GetSuitProgressBySuitId(_suitId, out count, out totalCount);
+            if (count >= totalCount)
+            {
+                return true;
+            }
+            return false;
+        }
     }
 }

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

@@ -842,10 +842,6 @@ namespace GFGGame
             }
             if (emojiValue.Length > 0)
             {
-                if(emojiValue != "0")
-                {
-                    SceneController.UpdateDialogPic("0", _sceneObject);
-                }
                 UpdateLiveEmoji(emojiValue);
             }
         }

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

@@ -106,6 +106,7 @@ namespace GFGGame
             _ui.m_btnXiuFang.target.onClick.Add(OnClickBtnXiuFang);
             _ui.m_btnCiPai.target.onClick.Add(OnClickBtnCiPai);
             _ui.m_headBar.target.onClick.Add(OnClickHeadBar);
+            _ui.m_guideBtn.onClick.Add(OnClickHeadBar);
             _ui.m_btnDailyWelfare.target.onClick.Add(OnClickBtnDailyWelfare);
             _ui.m_btnNewYearRedEnvelope.target.onClick.Add(OnClickBtnNewYearRedEnvelope);
             _ui.m_btnActivityLuckyBox.target.onClick.Add(OnClickBtnActivityLuckyBox);
@@ -526,7 +527,7 @@ namespace GFGGame
         private void OnClickBtnStore()
         {
             LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.SHANG_CHENG, 1);
-
+            GuideSimulationDataManager.Instance.GuideMonthlyJumpType = 1;
             ViewManager.Show<StoreView>();
         }
 
@@ -1292,6 +1293,11 @@ namespace GFGGame
             bool isGuide13 = GuideController.TryGuide(_ui.m_btnXiuFang.target, "ClothingSelectView", 2, "进入绣纺。");
             bool isGuide14 = GuideController.TryGuide(_ui.m_btnHaiZhiShi.target, "TimeTracingShowView", 2, "进入副本。");
 
+            if (GuideSimulationDataManager.Instance.GuideMonthlyJumpType == 1)
+            {
+                GuideController.TryGuide(_ui.m_guideBtn, ConstGuideId.SHEZHI_ZHUJIEMBG, 2, "开启背景更换特权");
+            }
+
             _ui.m_loaGuidestudio.visible = false;
             // if (isStudioMetalGuide || isStudioFilingGuide || isFieldGuide || isStudioPropertyGuide)
             // {

GameClient/Assets/Game/HotUpdate/Views/Poem/PoemGalleryView.cs

@@ -188,9 +188,9 @@ namespace GFGGame
 
                 // if (_ui.m_comFavorites.m_comScroll.m_listRecommend.numItems > 0) _ui.m_comFavorites.m_comScroll.m_listRecommend.ScrollToView(0);
                 // if (_ui.m_comFavorites.m_comScroll.m_listRecommend1.numItems > 0) _ui.m_comFavorites.m_comScroll.m_listRecommend1.ScrollToView(0);
-
                 _ui.m_comNormal.m_comScroll.m_listRecommend.numItems = 0;
                 _ui.m_comNormal.m_comScroll.m_listRecommend1.numItems = 0;
+
                 _ui.m_comFavorites.m_comScroll.m_listRecommend.numItems = 0;
                 _ui.m_comFavorites.m_comScroll.m_listRecommend1.numItems = 0;
 
@@ -226,6 +226,7 @@ namespace GFGGame
                     ViewManager.Show<PoemGalleryRewardGetView>();
                 }
             }
+            Timers.inst.AddUpdate(CheckGuide);
         }
 
         protected override void OnHide()
@@ -233,7 +234,7 @@ namespace GFGGame
             base.OnHide();
             ResetPullRelease();
             _ui.m_comNormal.m_comBoBox.selectedIndex = 0;
-
+            Timers.inst.Remove(CheckGuide);
         }
 
         protected override void RemoveEventListener()
@@ -445,7 +446,14 @@ namespace GFGGame
             {
                 if (_galleryDatas.Count % 2 == 0)
                 {
-                    _list.numItems = _galleryDatas.Count / 2;
+                    if (GuideDataManager.IsGuideFinish(ConstGuideId.HUALANG_TOUGAO) <= 0)
+                    {
+                        _list.numItems = 1;
+                    }
+                    else
+                    {
+                        _list.numItems = _galleryDatas.Count / 2;
+                    }
                     _list1.numItems = _galleryDatas.Count / 2;
                 }
                 else
@@ -503,11 +511,15 @@ namespace GFGGame
         private void RenderListItem(int index, GObject obj)
         {
             int num = index * 2;
-            if (_galleryDatas.Count <= num)
+            long workId = 0;
+            if (GuideDataManager.IsGuideFinish(ConstGuideId.HUALANG_TOUGAO) > 0)
             {
-                return;
+                if (_galleryDatas.Count <= num)
+                {
+                    return;
+                }
+                workId = _galleryDatas[num];
             }
-            long workId = _galleryDatas[num];
             UpdateListItem(workId, obj);
         }
 
@@ -527,32 +539,39 @@ namespace GFGGame
         {
             PoemGalleryData data = PoemGalleryDataManager.Instance.GetGalleryDataById(workId);
             UI_ListItem item = UI_ListItem.Proxy(obj);
-            item.m_c1.selectedIndex = 0;
-            if (data.Ntexture == null) return;
-            item.m_c1.selectedIndex = 1;
-            item.m_loaIcon.texture = data.Ntexture;
-            item.m_loaIcon.height = item.m_loaIcon.width * item.m_loaIcon.texture.height / item.m_loaIcon.texture.width;
-            item.m_txtName.text = data.AuthorName;
-            item.m_btnCollect.title = data.CollectCount.ToString();
-            item.m_btnCollect.selected = data.CollectOrNot;
-            item.m_btnVote.title = data.VoteCount.ToString();
-            item.m_btnVote.selected = data.VoteOrNot;
-
-            if (item.m_loaIcon.data == null)
+            if (GuideDataManager.IsGuideFinish(ConstGuideId.HUALANG_TOUGAO) <= 0)
             {
-                item.m_loaIcon.onClick.Add(OnLoaIconClick);
+                item.m_c1.selectedIndex = 1;
             }
-            item.m_loaIcon.data = workId;
-            if (item.m_btnCollect.data == null)
-            {
-                item.m_btnCollect.onClick.Add(OnBtnCollectClick);
-            }
-            item.m_btnCollect.data = workId;
-            if (item.m_btnVote.data == null)
+            else
             {
-                item.m_btnVote.onClick.Add(OnBtnVoteClick);
+                item.m_c1.selectedIndex = 0;
+                if (data.Ntexture == null) return;
+                item.m_c1.selectedIndex = 1;
+                item.m_loaIcon.texture = data.Ntexture;
+                item.m_loaIcon.height = item.m_loaIcon.width * item.m_loaIcon.texture.height / item.m_loaIcon.texture.width;
+                item.m_txtName.text = data.AuthorName;
+                item.m_btnCollect.title = data.CollectCount.ToString();
+                item.m_btnCollect.selected = data.CollectOrNot;
+                item.m_btnVote.title = data.VoteCount.ToString();
+                item.m_btnVote.selected = data.VoteOrNot;
+
+                if (item.m_loaIcon.data == null)
+                {
+                    item.m_loaIcon.onClick.Add(OnLoaIconClick);
+                }
+                item.m_loaIcon.data = workId;
+                if (item.m_btnCollect.data == null)
+                {
+                    item.m_btnCollect.onClick.Add(OnBtnCollectClick);
+                }
+                item.m_btnCollect.data = workId;
+                if (item.m_btnVote.data == null)
+                {
+                    item.m_btnVote.onClick.Add(OnBtnVoteClick);
+                }
+                item.m_btnVote.data = workId;
             }
-            item.m_btnVote.data = workId;
             UI_ListItem.ProxyEnd();
         }
 
@@ -561,6 +580,7 @@ namespace GFGGame
             long workId = _galleryDatas[index];
             PoemGalleryData data = PoemGalleryDataManager.Instance.GetGalleryDataById(workId);
             UI_ListRankItem item = UI_ListRankItem.Proxy(obj);
+
             if (data.Ntexture == null) return;
             item.m_loaIcon.texture = data.Ntexture;
             item.m_loaIcon.height = item.m_loaIcon.width * item.m_loaIcon.texture.height / item.m_loaIcon.texture.width;
@@ -801,5 +821,38 @@ namespace GFGGame
             OnPullUpTimeComplete();
             ViewManager.Hide<ModalStatusView>();
         }
+
+        private void CheckGuide(object param)
+        {
+            if (GuideDataManager.IsGuideFinish(ConstGuideId.HUALANG_TOUGAO) <= 0)
+            {
+                UpdateCheckGuide(null);
+                _ui.m_guideBtn1.visible = true;
+                _ui.m_guideBtn2.visible = true;
+                _ui.m_guideBtn3.visible = true;
+            }
+            else
+            {
+                _ui.m_guideBtn3.visible = false;
+                _ui.m_guideBtn1.visible = false;
+                _ui.m_guideBtn2.visible = false;
+                Timers.inst.Remove(CheckGuide);
+            }
+        }
+
+        protected void UpdateCheckGuide(object param)
+        {
+            if (!ViewManager.CheckIsTopView(this.viewCom)) return;
+            GuideController.TryGuide(_ui.m_guideBtn2, ConstGuideId.HUALANG_TOUGAO, 1, "点赞获得画廊积分可兑换多种拍照资源");
+            GuideController.TryGuide(_ui.m_guideBtn1, ConstGuideId.HUALANG_TOUGAO, 2, "收藏喜欢的作品");
+            GuideController.TryGuide(_ui.m_guideBtn3, ConstGuideId.HUALANG_TOUGAO, 3, "参与排行也可获得大量资源");
+            GuideController.TryGuide(_ui.m_btnJoin, ConstGuideId.HUALANG_TOUGAO, 4, "每周可进行两次投稿，快来积极投稿，让大家看见你的作品！");
+        }
+         
+        protected override void TryCompleteGuide()
+        {
+            GuideController.TryCompleteGuideIndex(ConstGuideId.HUALANG_TOUGAO, 4);
+            GuideController.TryCompleteGuide(ConstGuideId.HUALANG_TOUGAO, 4);
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/RoleInfo/MainBgChooseView.cs

@@ -52,12 +52,14 @@ namespace GFGGame
             InitMainUIPreview();
 
             UpdateSaveDressUpBgBtn();
+            Timers.inst.AddUpdate(CheckGuide);
         }
 
         protected override void OnHide()
         {
             base.OnHide();
             ReleaseMainUIPreview();
+            Timers.inst.Remove(CheckGuide);
         }
 
 
@@ -221,6 +223,7 @@ namespace GFGGame
 
         private void OnBtnGoShopClick()
         {
+            GuideSimulationDataManager.Instance.GuideMonthlyJumpType = 2;
             ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_MONTH_CARD, ConstStoreSubId.STORE_MONTH_GOLD_CARD });
         }
 
@@ -236,5 +239,44 @@ namespace GFGGame
             buttonToggle2.m_type.SetSelectedIndex(RoleDataManager.saveDressUpBgToMainBg);
             UI_ButtonToggle2.ProxyEnd();
         }
+        private void CheckGuide(object param)
+        {
+            if (GuideDataManager.IsGuideFinish(ConstGuideId.SHEZHI_ZHUJIEMBG) <= 0)
+            {
+                UpdateCheckGuide(null);
+            }
+            else
+            {
+                Timers.inst.Remove(CheckGuide);
+            }
+        }
+
+        protected void UpdateCheckGuide(object param)
+        {
+            if (!ViewManager.CheckIsTopView(this.viewCom)) return;
+            if (GuideSimulationDataManager.Instance.GuideMonthlyJumpType == 1)
+            {
+                GuideController.TryGuide(_ui.m_btnSaveDressUpBg.target, ConstGuideId.SHEZHI_ZHUJIEMBG, 4, "开启背景更换特权");
+            }
+            else if (GuideSimulationDataManager.Instance.GuideMonthlyJumpType == 2)
+            {
+                GuideController.TryGuide(_ui.m_btnSaveDressUpBg.target, ConstGuideId.SHEZHI_ZHUJIEMBG, 2, "开启背景更换特权");
+            }
+        }
+
+        protected override void TryCompleteGuide()
+        {
+            if (GuideSimulationDataManager.Instance.GuideMonthlyJumpType == 1)
+            {
+                GuideController.TryCompleteGuideIndex(ConstGuideId.SHEZHI_ZHUJIEMBG, 4);
+                GuideController.TryCompleteGuide(ConstGuideId.SHEZHI_ZHUJIEMBG, 4);
+            }
+            else if (GuideSimulationDataManager.Instance.GuideMonthlyJumpType == 2)
+            {
+                GuideController.TryCompleteGuideIndex(ConstGuideId.SHEZHI_ZHUJIEMBG, 2);
+                GuideController.TryCompleteGuide(ConstGuideId.SHEZHI_ZHUJIEMBG, 2);
+            }
+
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/RoleInfo/RoleInfoView.cs

@@ -51,7 +51,7 @@ namespace GFGGame
             _ui.m_photoList.itemRenderer = RenderPhotoListItem;
             _ui.m_photoList.onClickItem.Add(OnPhotoListItemClick);
             _ui.m_badgeList.itemRenderer = OnRenderBadgeListItem;
-
+            _ui.m_btnExchange.onClick.Add(OnClickBtnChangeMainBg);
             _ui.m_txtVersion.onClick.Add(OnClickGM);
 
         }
@@ -83,11 +83,13 @@ namespace GFGGame
             _ui.m_txtSlogan.text = RoleDataManager.slogan;
             UpdateAllInfo();
             _ui.m_btnShare.visible = false;
+            Timers.inst.AddUpdate(CheckGuide);
         }
 
         protected override void OnHide()
         {
             base.OnHide();
+            Timers.inst.Remove(CheckGuide);
         }
 
         private void OnBtnBackClick()
@@ -103,7 +105,10 @@ namespace GFGGame
                 ViewManager.Show<GMPanelView>();
             }
         }
-
+        private void OnClickBtnChangeMainBg()
+        {
+            ViewManager.Show<MainBgChooseView>();
+        }
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
@@ -326,5 +331,30 @@ namespace GFGGame
             _ui.m_badgeList.numItems = _ui.m_badgeList.numItems;
 
         }
+
+        private void CheckGuide(object param)
+        {
+            if (GuideDataManager.IsGuideFinish(ConstGuideId.SHEZHI_ZHUJIEMBG) <= 0)
+            {
+                UpdateCheckGuide(null);
+            }
+            else
+            {
+                Timers.inst.Remove(CheckGuide);
+            }
+        }
+
+        protected void UpdateCheckGuide(object param)
+        {
+            if (!ViewManager.CheckIsTopView(this.viewCom)) return;
+            if (GuideSimulationDataManager.Instance.GuideMonthlyJumpType == 1)
+            {
+                GuideController.TryGuide(_ui.m_btnExchange, ConstGuideId.SHEZHI_ZHUJIEMBG, 3, "去开启背景更换特权");
+            }
+            else if (GuideSimulationDataManager.Instance.GuideMonthlyJumpType == 2)
+            {
+
+            }
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/RoleInfo/SettingView.cs

@@ -75,6 +75,9 @@ namespace GFGGame
                 _ui.m_suit.Play();
                 _ui.m_c1.SetSelectedIndex(0);
             }
+            _ui.m_icon.visible = false;
+            _ui.m_iconBg.visible = false;
+            _ui.m_settingTypeList.visible = false;
             _ui.m_btnGiftCode.target.visible = GameConfig.hCode == 0;
         }
 

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

@@ -76,14 +76,8 @@ namespace GFGGame
             minLevel = Mathf.Max(1, minLevel);
             _ui.m_RewardList.ScrollToView(minLevel - 1);
             UpdateBtnBrocadeWeavTaskRed();
-            if (TimeHelper.ServerNow() >= 1711400400000)
-            {
-                _ui.m_Icon.visible = true;
-            }
-            else
-            {
-                _ui.m_Icon.visible = false;
-            }
+            BattlePassOpenCfg battleOpencfg = BattlePassOpenCfgArray.Instance.GetCfg(BattlePassTaskDataManager.Instance.GetSeasonId());
+            _ui.m_Icon.url = ResPathUtil.GetIconPath(battleOpencfg.picture, "png");
         }
 
         protected override void AddEventListener()
@@ -349,14 +343,6 @@ namespace GFGGame
                 return;
             }
             _ui.m_LeftTime.text = TimeUtil.FormattingTimeTo_DDHHmm(leftTime);
-            if (TimeHelper.ServerNow() >= 1711400400000)
-            {
-                _ui.m_Icon.visible = true;
-            }
-            else
-            {
-                _ui.m_Icon.visible = false;
-            }
         }
 
         private void SetBattlePassLevel()

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

@@ -49,6 +49,7 @@ namespace GFGGame
             _ui.m_btnBuy.target.onClick.Add(OnBtnBuyCardClick);
             _ui.m_btnGet.onClick.Add(OnBtnGetClick);
             _ui.m_btnBlackReward.onClick.Add(OnBtnBlackRewardClick);
+            _ui.m_guideBackBtn.onClick.Add(OnClickBtnBack);
             AddEffect();
         }
         protected override void AddEventListener()
@@ -65,6 +66,7 @@ namespace GFGGame
             _valueBarController.OnShown();
             UpdateView();
             UpdateRedDot();
+            Timers.inst.AddUpdate(CheckGuide);
         }
 
         protected override void OnHide()
@@ -72,6 +74,7 @@ namespace GFGGame
             base.OnHide();
             ShopViewManager.Instance.ClearItemEff();
             _valueBarController.OnHide();
+            Timers.inst.Remove(CheckGuide);
         }
 
         protected override void RemoveEventListener()
@@ -80,6 +83,11 @@ namespace GFGGame
             EventAgent.RemoveEventListener(ConstMessage.SHOP_BUY, UpdateView);
             EventAgent.RemoveEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
         }
+        private void OnClickBtnBack()
+        {
+            this.Hide();
+            ViewManager.GoBackFrom(typeof(StoreView).FullName);
+        }
         private void OnBtnBlackRewardClick()
         {
             ViewManager.Show<StoreBlackCardRewardView>();
@@ -221,5 +229,33 @@ namespace GFGGame
         {
             _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_holderfEff, "ui_Small_parts", "store_monthlycard");
         }
+
+        private bool CheckIsBuyMonthCard()
+        {
+            long endTime1 = GameGlobal.myNumericComponent.GetAsLong(NumericType.MonthCardGoldEndTime);
+            long endTime2 = GameGlobal.myNumericComponent.GetAsLong(NumericType.MonthCardBlackGoldEndTime);
+            if (endTime1 > TimeHelper.ServerNow() || endTime2 > TimeHelper.ServerNow())
+            {
+                return true;
+            }
+            return false;
+        }
+        private void CheckGuide(object param)
+        {
+            if (GuideDataManager.IsGuideFinish(ConstGuideId.SHEZHI_ZHUJIEMBG) <= 0 && CheckIsBuyMonthCard())
+            {
+                UpdateCheckGuide(null);
+            }
+            else
+            {
+                Timers.inst.Remove(CheckGuide);
+            }
+        }
+
+        protected void UpdateCheckGuide(object param)
+        {
+            if (!ViewManager.CheckIsTopView(this.viewCom)) return;
+            GuideController.TryGuide(_ui.m_guideBackBtn, ConstGuideId.SHEZHI_ZHUJIEMBG, 1, "去开启背景更换特权");
+        }
     }
 }

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

@@ -361,8 +361,8 @@ namespace GFGGame
         }
         private async ETTask ReqGetLevelRank()
         {
-            await TimeTracingSProxy.ReqGetLevelRank(_levelID);
-            await TimeTracingSProxy.ReqGetLevelFriendRank(_levelID);
+            //await TimeTracingSProxy.ReqGetLevelRank(_levelID);
+            //await TimeTracingSProxy.ReqGetLevelFriendRank(_levelID);
         }
     }
 }

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

@@ -75,14 +75,14 @@ namespace GFGGame
             {
                 _ui.m_txtTips.visible = true;
             }
-            if (TimeTracingDataManager.Instance.myLevelRankInfo == null)
+            if (TimeTracingDataManager.Instance.myLevelRankInfo[rankType] == null)
             {
                 _ui.m_myRank.target.visible = false;
             }
-            else if(TimeTracingDataManager.Instance.myLevelRankInfo.RankIndex == 0)
+            else if(TimeTracingDataManager.Instance.myLevelRankInfo[rankType].RankIndex == 0)
             {
                 _ui.m_myRank.target.visible = true;
-                LevelRankProto itemdata = TimeTracingDataManager.Instance.myLevelRankInfo;
+                LevelRankProto itemdata = TimeTracingDataManager.Instance.myLevelRankInfo[rankType];
                 _ui.m_myRank.m_txtName.text = itemdata.RoleName;
                 _ui.m_myRank.m_rankText.text = "--";
                 _ui.m_myRank.m_teamName.text = itemdata.LeagueName;
@@ -95,7 +95,7 @@ namespace GFGGame
             else
             {
                 _ui.m_myRank.target.visible = true;
-                LevelRankProto itemdata = TimeTracingDataManager.Instance.myLevelRankInfo;
+                LevelRankProto itemdata = TimeTracingDataManager.Instance.myLevelRankInfo[rankType];
                 _ui.m_myRank.m_txtName.text = itemdata.RoleName;
                 if(itemdata.RankIndex <= 100)
                 {

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

@@ -79,14 +79,14 @@ namespace GFGGame
             {
                 _ui.m_txtTips.visible = true;
             }
-            if (TimeTracingDataManager.Instance.mySuitRankInfo == null)
+            if (TimeTracingDataManager.Instance.mySuitRankInfo[rankType] == null)
             {
                 _ui.m_myRank.target.visible = false;
             }
-            else if(TimeTracingDataManager.Instance.mySuitRankInfo.RankIndex == 0)
+            else if(TimeTracingDataManager.Instance.mySuitRankInfo[rankType].RankIndex == 0)
             {
                 _ui.m_myRank.target.visible = true;
-                SuitCollectRankProto itemdata = TimeTracingDataManager.Instance.mySuitRankInfo;
+                SuitCollectRankProto itemdata = TimeTracingDataManager.Instance.mySuitRankInfo[rankType];
                 _ui.m_myRank.m_txtName.text = itemdata.RoleName;
                 _ui.m_myRank.m_rankText.text = "--";
                 _ui.m_myRank.m_teamName.text = itemdata.LeagueName;
@@ -100,7 +100,7 @@ namespace GFGGame
             else
             {
                 _ui.m_myRank.target.visible = true;
-                SuitCollectRankProto itemdata = TimeTracingDataManager.Instance.mySuitRankInfo;
+                SuitCollectRankProto itemdata = TimeTracingDataManager.Instance.mySuitRankInfo[rankType];
                 _ui.m_myRank.m_txtName.text = itemdata.RoleName;
                 //_ui.m_myRank.m_rankText.text = itemdata.RankIndex.ToString();
                 UpdateMyRank();
@@ -164,7 +164,7 @@ namespace GFGGame
         }
         private void UpdateMyRank()
         {
-            SuitCollectRankProto itemdata = TimeTracingDataManager.Instance.mySuitRankInfo;
+            SuitCollectRankProto itemdata = TimeTracingDataManager.Instance.mySuitRankInfo[rankType];
             if (itemdata.RankIndex <= 100)
             {
                 _ui.m_myRank.m_rankText.text = itemdata.RankIndex.ToString();