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

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/MainStoryDataManager.cs

@@ -203,5 +203,7 @@ namespace GFGGame
             }
             return false;
         }
+        //关卡当前难度类型
+        public static int currentChapterType = 0;
     }
 }

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/DailyWelfare/UI_DailySignRechargeTipsUI.cs

@@ -0,0 +1,83 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.DailyWelfare
+{
+    public partial class UI_DailySignRechargeTipsUI
+    {
+        public GComponent target;
+        public GTextField m_txtTitle;
+        public GTextField m_txtTips;
+        public GComponent m_comCostItem;
+        public GButton m_btnConfirm;
+        public GButton m_btnCancel;
+        public const string URL = "ui://t8nwuj7ihtuj93b";
+        public const string PACKAGE_NAME = "DailyWelfare";
+        public const string RES_NAME = "DailySignRechargeTipsUI";
+        private static UI_DailySignRechargeTipsUI _proxy;
+
+        public static UI_DailySignRechargeTipsUI Create(GObject gObject = null)
+        {
+            var ui = new UI_DailySignRechargeTipsUI();
+            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_DailySignRechargeTipsUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_DailySignRechargeTipsUI();
+            }
+            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_txtTitle = (GTextField)comp.GetChild("txtTitle");
+            m_txtTips = (GTextField)comp.GetChild("txtTips");
+            m_comCostItem = (GComponent)comp.GetChild("comCostItem");
+            m_btnConfirm = (GButton)comp.GetChild("btnConfirm");
+            m_btnCancel = (GButton)comp.GetChild("btnCancel");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_txtTitle = null;
+            m_txtTips = null;
+            m_comCostItem = null;
+            m_btnConfirm = null;
+            m_btnCancel = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_DailySignRechargeTipsUI.cs.meta

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

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/TimeTracing/UI_TimeTracingLevelRankUI.cs

@@ -15,6 +15,7 @@ namespace UI.TimeTracing
         public GTextField m_txtTips;
         public GTextField m_timeText;
         public UI_TimeTracingLevelRankItem m_myRank;
+        public GLoader m_rulerBtn;
         public const string URL = "ui://gayfh946l8151f";
         public const string PACKAGE_NAME = "TimeTracing";
         public const string RES_NAME = "TimeTracingLevelRankUI";
@@ -70,6 +71,7 @@ namespace UI.TimeTracing
             m_txtTips = (GTextField)comp.GetChild("txtTips");
             m_timeText = (GTextField)comp.GetChild("timeText");
             m_myRank = (UI_TimeTracingLevelRankItem)UI_TimeTracingLevelRankItem.Create(comp.GetChild("myRank"));
+            m_rulerBtn = (GLoader)comp.GetChild("rulerBtn");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -82,6 +84,7 @@ namespace UI.TimeTracing
             m_timeText = null;
             m_myRank.Dispose();
             m_myRank = null;
+            m_rulerBtn = 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/DailyWelfareSProxy.cs

@@ -24,10 +24,10 @@ namespace GFGGame
             return false;
         }
         //补签
-        public static async ETTask<bool> ReqReSign(int day)
+        public static async ETTask<bool> ReqReSign(int day, int type)
         {
             S2C_ReSign response = null;
-            response = (S2C_ReSign)await MessageHelper.SendToServer(new C2S_ReSign() { Day = day });
+            response = (S2C_ReSign)await MessageHelper.SendToServer(new C2S_ReSign() { Day = day ,ConsumeType = type});
             if (response != null)
             {
                 if (response.Error == ErrorCode.ERR_Success)

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/ActivityMainTips/ActivityMainTipsView.cs

@@ -42,16 +42,18 @@ namespace GFGGame
                 activitydata = AdCfgArray.Instance.dataArray;
             }
             _ui.m_t4.Play();
-            if (GameGlobal.myNumericComponent.GetAsInt(NumericType.IsPropYchmActivity) == 0)
-            {
-                ActivityDataManager.Instance.todayActivityTips = GameGlobal.myNumericComponent.GetAsInt(NumericType.IsPropYchmActivity);
-                _ui.m_notTips.url = "ui://ActivityMain/ts_jrbzts";
-                _ui.m_tipImg.visible = false;
-            }
             UpdateInfo();
         }
         protected async override void OnHide()
         {
+            if (_ui.m_tipImg.visible)
+            {
+                ActivityDataManager.Instance.todayActivityTips = 1;
+            }
+            else
+            {
+                ActivityDataManager.Instance.todayActivityTips = 0;
+            } 
             bool result;
             result = await ActivitySProxy.ReqActivityTips(NumericType.IsPropYchmActivity, ActivityDataManager.Instance.todayActivityTips);
             base.OnHide();

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);
                 // 发送服装合成成功事件
                 EventAgent.DispatchEvent(ConstMessage.CLOTHING_SYNTHETIC_SUCCESS);
                 EventAgent.DispatchEvent(ConstMessage.STUDIO_FILING_UPDATE);
@@ -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,12 +491,21 @@ namespace GFGGame
 
             GuideController.TryGuide(_ui.m_btnProduction, ConstGuideId.CLOTHING_SYNTHETIC, 5, "点击获得新的服饰。");
             GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.CLOTHING_SYNTHETIC, 6, "获得新衣服啦，继续通关主线剧情吧。");
-        }
 
-        /// <summary>
-        /// 按照屏幕尺寸 更新遮罩的高度
-        /// </summary>
-        /// <returns></returns>
+            GuideController.TryGuide(_ui.m_cardSyntheticBtn, ConstGuideId.CARD_HECHENG, 1, "领取卡牌。");
+            GuideController.TryGuide(null, ConstGuideId.CARD_HECHENG, 2, "获得套装卡牌后可进行技能书合成！", -1, true, _ui.target.height - 600);
+            GuideController.TryGuide(_ui.m_cardSyntheticBtn, ConstGuideId.CARD_HECHENG, 3, "进入卡牌合成");
+        }
+        protected override void TryCompleteGuide()
+        {
+            base.TryCompleteGuide();
+            GuideController.TryCompleteGuideIndex(ConstGuideId.CARD_HECHENG, 3);
+            GuideController.TryCompleteGuide(ConstGuideId.CARD_HECHENG, 3);
+        }
+            /// <summary>
+            /// 按照屏幕尺寸 更新遮罩的高度
+            /// </summary>
+            /// <returns></returns>
         private async Task UpdateMaskHeight()
         {
             await Task.Delay(5);
@@ -575,5 +585,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/DailyWelfare/DailySignView.cs

@@ -295,19 +295,7 @@ namespace GFGGame
 
             if (day < _day)
             {
-                int[] cost = GlobalCfgArray.globalCfg.dailySignConsumeArr[0];
-                AlertUI.Show(string.Format("是否确定花费{0}{1}补签？", cost[1], ItemCfgArray.Instance.GetCfg(cost[0]).name))
-                    .SetLeftButton(true, "否").SetRightButton(true, "是", async (object param) =>
-                    {
-                        if (!ItemUtil.CheckItemEnough(cost[0], cost[1]))
-                        {
-                            long has = ItemDataManager.GetItemNum(cost[0]);
-                            ItemUtil.BuyCurrency(cost[0], cost[1] - has);
-                            return;
-                        }
-
-                        result = await DailyWelfareSProxy.ReqReSign(day);
-                    });
+                ViewManager.Show<ReDailySignTipsView>(day);
             }
             else
             {

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

@@ -0,0 +1,111 @@
+using ET;
+using FairyGUI;
+using UI.DailyWelfare;
+using System;
+using System.Collections.Generic;
+using ET;
+
+namespace GFGGame
+{
+    //改弹窗只用与每日签到补签
+    //public delegate void TipsCallback();
+    class ReDailySignTipsView : BaseWindow
+    {
+        private UI_DailySignRechargeTipsUI _ui;
+        //private TipsCallback m_leftButtonCallback = null;
+        //private TipsCallback m_rightButtonCallback = null;
+        private int itemId = 0;
+        private string showTipsText = "";
+        private long hasNum;
+        private int type;
+        private int day = 1;
+        public override void Dispose()
+        {
+
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_DailySignRechargeTipsUI.PACKAGE_NAME;
+            _ui = UI_DailySignRechargeTipsUI.Create();
+            this.viewCom = _ui.target;
+            this.modal = true;
+            this.viewCom.Center();
+            viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
+
+            _ui.m_btnConfirm.onClick.Add(OnClickBtnConfirm);
+            _ui.m_btnCancel.onClick.Add(OnClickBtnCancel);
+            //_ui.m_btnCancel.onClick.Add(() =>
+            //{
+            //    this.Hide();
+            //    m_leftButtonCallback?.Invoke();
+            //});
+            //_ui.m_btnConfirm.onClick.Add(() =>
+            //{
+            //    this.Hide();
+            //    m_rightButtonCallback?.Invoke();
+            //});
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+            day = (int)this.viewData;
+            UpdateView();
+        }
+        private void UpdateView()
+        {
+            CheckItemId();
+        }
+        protected override void OnHide()
+        {
+            //m_leftButtonCallback = null;
+            //m_rightButtonCallback = null;
+            base.OnHide();
+        }
+        private void CheckItemId()
+        {
+            int[][] SecondCost = GlobalCfgArray.globalCfg.dailySignConsumeArr;
+            int[][] FirstCost = GlobalCfgArray.globalCfg.SecDailySignConsumeArr;
+            int needNum = 1;
+            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);
+                type = 1;
+                itemId = FirstCost[0][0];
+                needNum = FirstCost[0][1];
+            }
+            else
+            {
+                type = 0;
+                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);
+            }
+            ItemUtil.UpdateItemNumAndNeedNum(_ui.m_comCostItem, itemId, needNum, true);
+        }
+        private void OnClickBtnCancel()
+        {
+            this.Hide();
+        }
+        private async void OnClickBtnConfirm()
+        {
+            if (!ItemUtil.CheckItemEnough(itemId, (int)hasNum) && itemId == 1000005)
+            {
+                long has = ItemDataManager.GetItemNum((int)hasNum);
+                ItemUtil.BuyCurrency(itemId, (int)hasNum - has);
+                return;
+            }
+           bool result = await DailyWelfareSProxy.ReqReSign(day,type);
+           this.Hide();
+        }
+    }
+}

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

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

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxVideoView.cs

@@ -18,11 +18,11 @@ namespace GFGGame
         private RawImage imgVideo;
         private Button BtnSkipVertical;
         private VideoPlayer videoPlayer;
+        private AudioSource audioSource;
         private List<ItemData> _rewardList;
 
         public void Show(List<ItemData> _reward = null)
         {
-            MusicManager.Instance.PlayCroutine(ResPathUtil.GetMusicPath("luckyboxMp3", "mp3"));
             FairyGUI.GRoot.inst.touchable = false;
             string path = ResPathUtil.GetUUIPrefabPath("UILuckyBox");
             handle = YooAssets.LoadAssetSync<GameObject>(path);
@@ -47,6 +47,9 @@ namespace GFGGame
             videoPlayer.url = videoHandle.GetRawFilePath();
             videoPlayer.Play();
 
+            audioSource = _ui.transform.GetComponent<AudioSource>();
+            audioSource.Play();
+
             _rewardList = _reward;
         }
 

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

@@ -79,6 +79,8 @@ namespace GFGGame
                 subType = (int)(this.viewData as object[])[0];
                 chapterIndex = Mathf.Max(1, (int)(this.viewData as object[])[1]);
             }
+            subType = MainStoryDataManager.currentChapterType;
+            CheckChapterIndex();
             _ui.m_listType.selectedIndex = subType;
             _ui.m_listChapter.touchable = false;
             UpdateList();
@@ -118,6 +120,7 @@ namespace GFGGame
         private void OnClickListTypeItem()
         {
             this.subType = _ui.m_listType.selectedIndex;
+            MainStoryDataManager.currentChapterType = _ui.m_listType.selectedIndex;
             UpdateList(true);
         }
         private void OnClickListChapterItem(EventContext context)
@@ -486,6 +489,18 @@ namespace GFGGame
                 item.y = -_ui.m_listChapter.height * distanceX;
             }
         }
-        
+        private void CheckChapterIndex()
+        {
+            chapterIndex = 0;
+            List<StoryChapterCfg> storyChapterList = StoryChapterCfgArray.Instance.GetCfgsBysubType(MainStoryDataManager.currentChapterType);
+            foreach (StoryChapterCfg item in storyChapterList)
+            {  
+                if (!MainStoryDataManager.CheckChapterUnlock(item.id))
+                {
+                    return;
+                }
+                chapterIndex++;
+            }
+        }
       }
 }

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);
@@ -391,6 +392,7 @@ namespace GFGGame
         }
         private void OnClickBtnMain()
         {
+            MainStoryDataManager.currentChapterType = 0;
             isOpen = MainControllerr.GotoStoryChapter(isOpen);
         }
 
@@ -526,7 +528,7 @@ namespace GFGGame
         private void OnClickBtnStore()
         {
             LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.SHANG_CHENG, 1);
-
+            GuideSimulationDataManager.Instance.GuideMonthlyJumpType = 1;
             ViewManager.Show<StoreView>();
         }
 
@@ -1292,6 +1294,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

@@ -32,6 +32,7 @@ namespace GFGGame
             viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
             _ui.m_c1.onChanged.Add(OnTabChange);
+            _ui.m_rulerBtn.onClick.Add(RuleController.ShowRuleView);
             _ui.m_listRank.SetVirtual();
             _ui.m_listRank.itemRenderer = RenderListItem;
         }
@@ -40,6 +41,7 @@ namespace GFGGame
             base.OnShown();
             LevelID = (int)this.viewData;
             curTime = (int)(TimeTracingDataManager.RefreshTime - TimeHelper.ServerNow())/1000;
+            _ui.m_rulerBtn.data = 300031;
             UpdateView();
             if (curTime > 60)
             {
@@ -75,14 +77,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 +97,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();

GameClient/Assets/ResIn/UUI/UILuckyBox.prefab

@@ -12,6 +12,7 @@ GameObject:
   - component: {fileID: 5558493903024588817}
   - component: {fileID: 3027397433677819976}
   - component: {fileID: 7362622180705135904}
+  - component: {fileID: 5920855872825401642}
   m_Layer: 5
   m_Name: UILuckyBox
   m_TagString: Untagged
@@ -102,6 +103,102 @@ MonoBehaviour:
   m_BlockingMask:
     serializedVersion: 2
     m_Bits: 4294967295
+--- !u!82 &5920855872825401642
+AudioSource:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3226370377293259953}
+  m_Enabled: 1
+  serializedVersion: 4
+  OutputAudioMixerGroup: {fileID: 0}
+  m_audioClip: {fileID: 8300000, guid: 7d689ed887989f44881d12459c9267e7, type: 3}
+  m_PlayOnAwake: 1
+  m_Volume: 1
+  m_Pitch: 1
+  Loop: 0
+  Mute: 0
+  Spatialize: 0
+  SpatializePostEffects: 0
+  Priority: 128
+  DopplerLevel: 1
+  MinDistance: 1
+  MaxDistance: 500
+  Pan2D: 0
+  rolloffMode: 0
+  BypassEffects: 0
+  BypassListenerEffects: 0
+  BypassReverbZones: 0
+  rolloffCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 1
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  panLevelCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  spreadCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  reverbZoneMixCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
 --- !u!1 &5639216484651693872
 GameObject:
   m_ObjectHideFlags: 0