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

# Conflicts:
#	GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxBonusShowView.cs
#	GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxVideoView.cs

GameClient/Assets/Editor/Excel/CodeBuilder.cs

@@ -504,7 +504,8 @@ namespace GFGEditor
                     }
                     if (string.IsNullOrEmpty(_value))
                     {
-                        ET.Log.Error(configArrayName + "  第" + row + "行  " + _type + "   无数值!");
+                        ET.Log.Error(configArrayName + "  第" + row + "行  " + _type + "   无数值!name:" + name + ",id:" +
+                                     worksheet[row, 1].Text.ToString());
                         continue;
                     }
                     if (!_twoDimensionalDic.ContainsKey(_types[1]))

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

@@ -254,5 +254,7 @@ namespace GFGGame
         public const string NEWROLEGETSUIT = "NEWROLE_GETSUIT";
         //搭配学院升级成功
         public const string COLLEGE_UPGRADE = "COLLEGE_UPGRADE";
+        //兑换成功
+        public const string EXCHANGE_SUCCESS = "EXCHANGE_SUCCESS";
     }
 }

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

@@ -63,7 +63,7 @@ namespace GFGGame
 
         }
         private static GList targetList = null;
-        public static bool TryGuide(GComponent target, string guideKey, int index, string guideStr = null, int listIndex = -1, bool checkPriorIndex = true, float yTxt = 0, bool justHint = false, bool noTips = false)
+        public static bool TryGuide(GComponent target, string guideKey, int index, string guideStr = null, int listIndex = -1, bool checkPriorIndex = true, float yTxt = 0, bool justHint = false, bool noTips = false,bool otherChapterID = false)
         {
             if (!GameGlobal.PreDataInited)
             {
@@ -89,7 +89,9 @@ namespace GFGGame
             bool isFinishPriorIndex = !checkPriorIndex || checkPriorIndex && GuideDataManager.IsGuideIndexFinish(cfg.id, index - 1) == true;//前置index已完成
             // ET.Log.Debug("storyLevelId:" + cfg.storyLevelId + "    time:" + TimeHelper.ClientNowSeconds());
             bool isCfgChapterOpen = MainStoryDataManager.CheckLevelUnlock(cfg.storyLevelId, false);//引导配置关卡已开启
-            bool isCfgChapter = MainStoryDataManager.currentLevelCfgId == 0 || MainStoryDataManager.currentLevelCfgId == cfg.storyLevelId;//无选择（进入游戏时无选择）或当前所选择为配置关卡
+            bool isCfgChapter = MainStoryDataManager.currentLevelCfgId == 0 
+                || otherChapterID
+                || MainStoryDataManager.currentLevelCfgId == cfg.storyLevelId;//无选择（进入游戏时无选择）或当前所选择为配置关卡
 
             if (isStoryLevelGuide && isPass && !isFinishCurId)
             {

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

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Main
+{
+    public partial class UI_Component9
+    {
+        public GComponent target;
+        public GLoader m_switchChapter;
+        public const string URL = "ui://mfvz4q8kswua9fzs";
+        public const string PACKAGE_NAME = "Main";
+        public const string RES_NAME = "Component9";
+        private static UI_Component9 _proxy;
+
+        public static UI_Component9 Create(GObject gObject = null)
+        {
+            var ui = new UI_Component9();
+            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_Component9 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Component9();
+            }
+            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_switchChapter = (GLoader)comp.GetChild("switchChapter");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_switchChapter = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -26,7 +26,7 @@ namespace UI.Main
         public UI_CompBonusBox m_bonusBox1;
         public GTextField m_txtStarCount;
         public GGroup m_bonusBox;
-        public GLoader m_switchChapter;
+        public UI_Component9 m_switchChapter;
         public GTextField m_ZCJBTimeText;
         public GGroup m_ActivityZCJB;
         public GLoader m_suitBg;
@@ -101,7 +101,7 @@ namespace UI.Main
             m_bonusBox1 = (UI_CompBonusBox)UI_CompBonusBox.Create(comp.GetChild("bonusBox1"));
             m_txtStarCount = (GTextField)comp.GetChild("txtStarCount");
             m_bonusBox = (GGroup)comp.GetChild("bonusBox");
-            m_switchChapter = (GLoader)comp.GetChild("switchChapter");
+            m_switchChapter = (UI_Component9)UI_Component9.Create(comp.GetChild("switchChapter"));
             m_ZCJBTimeText = (GTextField)comp.GetChild("ZCJBTimeText");
             m_ActivityZCJB = (GGroup)comp.GetChild("ActivityZCJB");
             m_suitBg = (GLoader)comp.GetChild("suitBg");
@@ -136,6 +136,7 @@ namespace UI.Main
             m_bonusBox1 = null;
             m_txtStarCount = null;
             m_bonusBox = null;
+            m_switchChapter.Dispose();
             m_switchChapter = null;
             m_ZCJBTimeText = null;
             m_ActivityZCJB = null;

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

@@ -13,7 +13,7 @@ namespace GFGGame
                 if (response.Error == ErrorCode.ERR_Success)
                 {
                     ItemDataManager.InitItemExchange(response.ItemId, response.ExchangedTimes);
-                    // EventAgent.DispatchEvent(ConstMessage.SHOP_BUY);
+                    EventAgent.DispatchEvent(ConstMessage.EXCHANGE_SUCCESS);
                     return true;
                 }
             }

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

@@ -78,6 +78,28 @@ namespace GFGGame
             }
             return true;
         }
+        //获取指定关卡评分奖励状态
+        public static async ETTask<bool> ReqGetAppointLevelRewardStatus(int levelID)
+        {
+            Dictionary<int, int> rewardData = null;
+            S2C_GetInstanceZonesRatingRewardList response = null;
+                    rewardData = new Dictionary<int, int>();
+                    response = (S2C_GetInstanceZonesRatingRewardList)await MessageHelper.SendToServer(new C2S_GetInstanceZonesRatingRewardList { StoryLevelId = levelID });
+                    if (!(response is { Error: ErrorCode.ERR_Success })) return false;
+                    for (int j = 0; j < response.RewardKs.Count; j++)
+                    {
+                        rewardData.Add(response.RewardKs[j], response.RewardVs[j]);
+                    }
+                    if (TimeTracingDataManager.LevelRewardDic.ContainsKey(levelID))
+                    {
+                        TimeTracingDataManager.LevelRewardDic[levelID] = rewardData;
+                    }
+                    else
+                    {
+                        TimeTracingDataManager.LevelRewardDic.Add(levelID, rewardData);
+                    }
+            return true;
+        }
         //领取条积分奖励
         public static async ETTask<bool> ReqGetLevelReward(int levelId ,int rewardId)
         {

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

@@ -140,7 +140,7 @@ namespace GFGGame
             UI_ComponentValueBar.ProxyEnd();
             _valueBarController.UpdateList(new List<int>() { 3000023, ConstItemID.DIAMOND_PURPLE, ConstItemID.DIAMOND_RED });
             _ui.m_selectChapter.visible = false;
-            _ui.m_switchChapter.visible = false;
+            _ui.m_switchChapter.target.visible = false;
             _ui.m_bonusBox.visible = false;
             _ui.m_ActivityZCJB.visible = true;
             ActivityOpenCfg _activityCfg = ActivityOpenCfgArray.Instance.GetCfg(5006);

GameClient/Assets/Game/HotUpdate/Views/ActivityThemeLuckyBox/ActivityThemeLuckyBoxView.cs

@@ -37,7 +37,7 @@ namespace GFGGame
             _ui.m_btnChapter.target.onClick.Add(OnBtnChapterClick);
             _ui.m_btnLuckyBox.target.onClick.Add(OnBtnLuckyBoxClick);
             _ui.m_btnShop.target.onClick.Add(OnBtnShopClick);
-
+            PreloadSuitModel();
         }
 
         protected override void AddEventListener()
@@ -210,5 +210,17 @@ namespace GFGGame
                 _effectUIDic.Add("R", EffectUIPool.CreateEffectUI(_ui.m_btnChapter.m_effectHolder, "ui_Activity", "SYJH_icon_tx_R"));
             }
         }
+        private void PreloadSuitModel()
+        {
+            int[] suitIDList = ActivityOpenCfgArray.Instance.GetCfg(2).params2Arr;
+            for (int i = 0; i < suitIDList.Length; i++)
+            {
+                SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(suitIDList[i]);
+                ResType resType = ResType.Sprite;
+                if (suitCfg.aniRes != "")
+                    resType = ResType.Animation;
+                PreDownloadManager.Instance.PreDownloadSuitRes(suitIDList[i], resType, new int[] { ConstDressUpItemType.BEI_JING }, true);
+            }
+        }
     }
 }

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

@@ -147,7 +147,6 @@ namespace GFGGame
             listItem.m_txtLv.text = data.lv + "级";
             listItem.m_txtName.text = data.itemCfg.name;
             RedDotController.Instance.SetComRedDot(listItem.target, RedDotDataManager.Instance.GetCardRed(data.id), "", 5, -10);
-            RedDotController.Instance.SetComRedDot(listItem.target, RedDotDataManager.Instance.CheckCardCanSynthetic(data.id), "", 5, -10);
             listItem.m_rarity.selectedIndex = data.itemCfg.rarity;
 
             if (data.itemCfg.rarity == 5)

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

@@ -126,6 +126,7 @@ namespace GFGGame
             {
                 item.m_loaIcon.url = "ui://DailyWelfare/hdbn_xslc_" + openCfg.res;
                 item.m_loaTitle.url = "ui://DailyWelfare/hdbn_wz_xslc_" + openCfg.res;
+                item.m_loaTitle.visible = false;
             }
             else if (openCfg.id == 501)
             {

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

@@ -58,6 +58,7 @@ namespace GFGGame
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("hzs_bg");
             _effectUI2 = EffectUIPool.CreateEffectUI(_ui.m_bg_eff, "ui_HaiZhiShi", "Bg_All_Tx");
             _effectUI3 = EffectUIPool.CreateEffectUI(_ui.m_fish_eff, "ui_HaiZhiShi", "Bg_Yu");
+            PreloadSuitModel();
         }
 
         protected override void OnShown()
@@ -183,6 +184,18 @@ namespace GFGGame
             GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.ENTER_CHAPTER_5, 1, "", -1, false);
             GuideController.TryGuide(_ui.m_btnField.target, "TimeTracingShowView", 3, "合成副本可获得奖励和服装哦~");
         }
+        private void PreloadSuitModel()
+        {
+            List<int> suitIdList = new List<int>() { 201030, 201010, 202006 };
+            for (int i = 1; i < suitIdList.Count; i++)
+            {
+                SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(suitIdList[i]);
+                ResType resType = ResType.Sprite;
+                if (suitCfg.aniRes != "")
+                    resType = ResType.Animation;
+                PreDownloadManager.Instance.PreDownloadSuitRes(suitIdList[i], resType, new int[] { ConstDressUpItemType.BEI_JING }, false);
+            }
+        }
 
     }
 }

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

@@ -147,9 +147,9 @@ namespace GFGGame
             _recordOpenIndex.Clear();
             _recordTurnIndex.Clear();
             _itemHasNew.Clear();
-            _ui.m_BtnPass.visible = true;
+            _ui.m_BtnPass.visible = false;
             _ui.m_touchFlipOpen.touchable = false;
-            GetSuitItemController.isAuto = false;
+            
 
             if (_rewardList.Count == 1)
             {
@@ -164,7 +164,6 @@ namespace GFGGame
                     UpdateItem(_ui.target.GetChild("item" + i).asCom, i, 10);
                 }
             }
-
             //修改，因为加了抽奖动画，在进入后就直接筛选掉所有不是新的
             for (int i = 0; i < _rewardList.Count; i++)
             {
@@ -176,7 +175,11 @@ namespace GFGGame
                 }
                 UI_LuckyBoxBonusShowItem.ProxyEnd();
             }
-            Timers.inst.Add(0.5f, 1, UpDataTimeTouchLoaBg);
+            if(GetSuitItemController.isAuto)
+            {
+                OnClickBtnPass();
+            }
+            Timers.inst.Add(0.5f, 1, UpDataTimeTouchLoaBg); 
         }
 
         protected override void OnHide()

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

@@ -22,7 +22,7 @@ namespace GFGGame
 
         public void Show(List<ItemData> _reward = null)
         {
-            MusicManager.Instance.Stop();
+            MusicManager.Instance.PlayCroutine(ResPathUtil.GetMusicPath("luckyboxMp3", "mp3"));
             FairyGUI.GRoot.inst.touchable = false;
             string path = ResPathUtil.GetUUIPrefabPath("UILuckyBox");
             handle = YooAssets.LoadAssetSync<GameObject>(path);
@@ -36,7 +36,7 @@ namespace GFGGame
 
             BtnSkipVertical = _ui.transform.Find("BtnSkipVertical").GetComponent<Button>();
             BtnSkipVertical.onClick.AddListener(OnClickrectBtnSkip);
-            BtnSkipVertical.gameObject.SetActive(false);
+            BtnSkipVertical.gameObject.SetActive(true);
 
             videoPlayer = _ui.transform.Find("VideoPlayer").GetComponent<VideoPlayer>();
             videoPlayer.loopPointReached += OnVideoEnded;
@@ -97,6 +97,7 @@ namespace GFGGame
 
         private void OnClickrectBtnSkip()
         {
+            GetSuitItemController.isAuto = true;
             Hide();
         }
 
@@ -120,7 +121,6 @@ namespace GFGGame
             StopAllCoroutines();
             videoPlayer.Stop();
             videoPlayer.loopPointReached -= OnVideoEnded;
-            MusicManager.Instance.PlayCroutine(ResPathUtil.GetMusicPath(ConstMusicName.DEFAULT));
             handle.Release();
             handle = null;
             videoHandle.Release();

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

@@ -153,7 +153,15 @@ namespace GFGGame
                 }
                 else
                 {
-
+                    StoryChapterCfg chapter = StoryChapterCfgArray.Instance.GetCfg(chapterID);
+                    if (!StoryController.CheckSuitGot(chapter.suitId))
+                    {
+                        PromptController.Instance.ShowFloatTextPrompt("需集齐所需套装");
+                    }
+                    else if (GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl) < chapterCfg.lvl)
+                    {
+                        PromptController.Instance.ShowFloatTextPrompt(string.Format("角色等级达到{0}级开启", chapterCfg.lvl));
+                    }
                 }
             }
 
@@ -313,16 +321,19 @@ namespace GFGGame
                 listItem.m_content.m_txtCurProgress.text = starCountChapter.ToString();
                 listItem.m_content.m_txtMaxProgress.text = chapterCfg.bonusStar3.ToString();
                 _ui.m_listChapter.GetChildAt(i).visible = false;
+                //暂定精英关卡不显示
+                if (subType != 1)
+                {
+                    ChapterRewardCfg chapterReward = ChapterRewardCfgArray.Instance.GetCfgBychapterId(chapterID);
+                    listItem.m_content.m_reward.m_rewardIcon.url = ResPathUtil.GetIconPath(ItemCfgArray.Instance.GetCfg(chapterReward.bonusOnceArr[0][0]).res, "png");
+                    listItem.m_content.m_reward.m_rewardNum.text = string.Format("x{0}", chapterReward.bonusOnceArr[0][1].ToString());
+                }
                 if (MainStoryDataManager.CheckChapterUnlock(chapterCfg.id) && StoryController.CheckSuitGot(previousChapterCfg.suitId))
                 {
                     listItem.m_content.m_imgLockBg.visible = false;
                     listItem.m_content.m_txtLockDesc.visible = false;
                     currentChapterIndex = i;
                     List<StoryLevelCfg> storylevelList = StoryLevelCfgArray.Instance.GetCfgsBytypeAndsubTypeAndchapterId(chapterCfg.type,chapterCfg.subType,chapterCfg.id);
-                    ChapterRewardCfg chapterReward = ChapterRewardCfgArray.Instance.GetCfgBychapterId(chapterID);
-                    listItem.m_content.m_reward.m_rewardIcon.url = ResPathUtil.GetIconPath(ItemCfgArray.Instance.GetCfg(chapterReward.bonusOnceArr[0][0]).res, "png");
-                    listItem.m_content.m_reward.m_rewardNum.text = string.Format("x{0}", chapterReward.bonusOnceArr[0][1].ToString());
-
                     if (InstanceZonesDataManager.CheckLevelPass(storylevelList[storylevelList.Count - 1].id))
                     {
                         listItem.m_content.m_reward.target.visible = true;
@@ -349,7 +360,6 @@ namespace GFGGame
                 }
                 else
                 {
-                    listItem.m_content.m_reward.target.visible = false;
                     listItem.m_content.m_imgLockBg.visible = true;
                     listItem.m_content.m_txtLockDesc.visible = true;
                     if (chapterCfg.lvl > GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl))
@@ -374,6 +384,10 @@ namespace GFGGame
                 {
                     listItem.m_content.m_reward.target.visible = false;
                 }
+                else
+                {
+                    listItem.m_content.m_reward.target.visible = true;
+                }
                 UI_ListChapterItem.ProxyEnd();
             }
             if (isView)
@@ -437,6 +451,8 @@ namespace GFGGame
             //GuideController.TryGuide(_ui.m_listChapter, ConstGuideId.ENTER_CHAPTER_4, 3, "", 1, true, _ui.target.height / 2);
             //GuideController.TryGuide(_ui.m_listChapter, ConstGuideId.ENTER_CHAPTER_5, 3, "", 1, true, _ui.target.height / 2);
             GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.STUDIO_PORCELAIN, 1, "点击返回主界面。");
+            GuideController.TryGuide(_ui.m_listType, ConstGuideId.ENTER_CHAPTER_2, 4, "切换精英关卡。",1);
+            GuideController.TryGuide(_ui.m_listChapter, ConstGuideId.ENTER_CHAPTER_2, 5, "选择精英关卡。", 1);
         }
 
         private void DoSpecialEffect(object parm = null)

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

@@ -90,7 +90,7 @@ namespace GFGGame
             _valueBarController = new ValueBarController(_ui.m_valueBar);
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
             _ui.m_btnHome.onClick.Add(OnClickBtnHome);
-            _ui.m_switchChapter.onClick.Add(OnClickSwitchBack);
+            _ui.m_switchChapter.target.onClick.Add(OnClickSwitchBack);
             _ui.m_chapter.m_compChapterScroll.m_imgBegin.onClick.Add(OnClickNext);
             _ui.m_suitIcon.onClick.Add(OnClickGotoView);
             _ui.m_bonusBox1.target.onClick.Add(() =>
@@ -216,7 +216,7 @@ namespace GFGGame
                 UI_ComponentValueBar.ProxyEnd();
                 _valueBarController.UpdateList(new List<int>() { ConstItemID.DIAMOND_PURPLE, ConstItemID.DIAMOND_RED });
                 _ui.m_selectChapter.visible = false;
-                _ui.m_switchChapter.visible = false;
+                _ui.m_switchChapter.target.visible = false;
                 _ui.m_bonusBox.visible = false;
                 _ui.m_ActivityZCJB.visible = true;
                 long timeActivity = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(17).EndTime - TimeHelper.ServerNow();
@@ -228,7 +228,7 @@ namespace GFGGame
                 valueBar.m_c1.selectedIndex = 1;
                 UI_ComponentValueBar.ProxyEnd();
                 _ui.m_selectChapter.visible = true;
-                _ui.m_switchChapter.visible = true;
+                _ui.m_switchChapter.target.visible = true;
                 _ui.m_bonusBox.visible = true;
                 _ui.m_ActivityZCJB.visible = false;
             }
@@ -302,10 +302,13 @@ namespace GFGGame
 
             StoryLevelCfg lastLevelCfg = list[list.Count - 1];
             StoryChapterCfg LastChapterCfg = StoryChapterCfgArray.Instance.GetCfg(_chapterID + 1);
-            if (lastLevelCfg != null && InstanceZonesDataManager.CheckLevelPass(lastLevelCfg.id) && LastChapterCfg != null)
+            if (lastLevelCfg != null && InstanceZonesDataManager.CheckLevelPass(lastLevelCfg.id))
             {
-                _ui.m_chapter.m_compChapterScroll.m_imgBegin.visible = true;
-                _ui.m_chapter.m_compChapterScroll.m_nextEffect.visible = true;
+                if(LastChapterCfg != null)
+                {
+                    _ui.m_chapter.m_compChapterScroll.m_imgBegin.visible = true;
+                    _ui.m_chapter.m_compChapterScroll.m_nextEffect.visible = true;
+                }    
                 if (chapterCfg.suitId > 0 && chapterCfg.subType == 0)
                 {
                     _ui.m_targetSuit.visible = true;
@@ -601,8 +604,9 @@ namespace GFGGame
 
             //bool isGuide6 = GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.CLOTHING_DECOMPOSE, 1, "点击返回主界面。");
 
-            bool isGuide7 = GuideController.TryGuide(unPasslevelCom, ConstGuideId.ENTER_CHAPTER_2, 3, "来继续我们的旅程吧。");
-            GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_2, 3);
+            bool isGuide7 = GuideController.TryGuide(_ui.m_switchChapter.target, ConstGuideId.ENTER_CHAPTER_2, 3, "进入章节选择。");
+            GuideController.TryGuide(unPasslevelCom, ConstGuideId.ENTER_CHAPTER_2, 6, "进入精英关卡。",-1,true,0,false,false,true);
+            
 
             //bool isGuide8 = GuideController.TryGuide(unPasslevelCom, ConstGuideId.ENTER_CHAPTER_3, 3, "来继续我们的旅程吧。");
             //GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_3, 3);
@@ -633,8 +637,8 @@ namespace GFGGame
             GuideController.TryCompleteGuideIndex(ConstGuideId.ENTER_CHAPTER_1, 3);
             GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_1, 3);
             // GuideCfg cfg2 = GuideCfgArray.Instance.GetCfg(ConstGuideId.ENTER_CHAPTER_2);
-            GuideController.TryCompleteGuideIndex(ConstGuideId.ENTER_CHAPTER_2, 3);
-            GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_2, 3);
+            //GuideController.TryCompleteGuideIndex(ConstGuideId.ENTER_CHAPTER_2, 3);
+            //GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_2, 3);
             // GuideCfg cfg3 = GuideCfgArray.Instance.GetCfg(ConstGuideId.ENTER_CHAPTER_3);
             //GuideController.TryCompleteGuideIndex(ConstGuideId.ENTER_CHAPTER_3, 3);
             //GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_3, 3);

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

@@ -428,12 +428,15 @@ namespace GFGGame
             // GuideController.TryCompleteGuide(ConstGuideId.OPEN_TAGS, 1);
             GuideController.TryGuide(_ui.m_btnStart, ConstGuideId.STUDIO_PORCELAIN, 6, "");
             GuideController.TryGuide(_ui.m_btnStart, ConstGuideId.STUDIO_PROPERTY, 5, "");
+            GuideController.TryGuide(_ui.m_btnStart, ConstGuideId.ENTER_CHAPTER_2, 7, "", -1, true, 0, false, false, true);
         }
 
         protected override void TryCompleteGuide()
         {
             // GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.CLOTHING_SYNTHETIC);
             //GuideController.TryCompleteGuideIndex(ConstGuideId.CLOTHING_SYNTHETIC, 3);
+            GuideController.TryCompleteGuideIndex(ConstGuideId.ENTER_CHAPTER_2, 7);
+            GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_2, 7);
         }
     }
 }

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

@@ -98,7 +98,7 @@ namespace GFGGame
             _effectUI10 = EffectUIPool.CreateEffectUI(_ui.m_comExpBar.m_proExp.m_comHolder.m_holder, "ui_fight_new", "ZDJS_jindu_tx");
             _effectUI11 = EffectUIPool.CreateEffectUI(_ui.m_comExpBar.m_holderHead, "ui_fight_new", "ZDJS_player");
         }
-        protected override void OnShown()
+        protected async override void OnShown()
         {
             base.OnShown();
             _resultData = (StoryFightResultData)this.viewData;
@@ -140,9 +140,17 @@ namespace GFGGame
                 Timers.inst.Add(3, 1, OnClickBtnClose);
             }
             _ui.m_comResult.m_t0.Play(AddExp);
+
+            StoryLevelCfg storylevel = StoryLevelCfgArray.Instance.GetCfg(MainStoryDataManager.currentLevelCfgId);
+            if (_resultData.Result && storylevel.type == 6 && storylevel.subType == 2)
+            {
+                //await TimeTracingSProxy.ReqGetMaxLevelInfo(TimeTracingDataManager._currentChapterId);
+                await TimeTracingSProxy.ReqGetAppointLevelRewardStatus(TimeTracingDataManager._currentChapterId);
+                await TimeTracingSProxy.ReqGetSuitRewardStatus();
+            }
         }
 
-        protected async override void OnHide()
+        protected override void OnHide()
         {
             base.OnHide();
 
@@ -166,13 +174,6 @@ namespace GFGGame
             }
             else
             {
-                StoryLevelCfg storylevel = StoryLevelCfgArray.Instance.GetCfg(MainStoryDataManager.currentLevelCfgId);
-                if (storylevel.type == 6 && storylevel.subType == 2)
-                {
-                    await TimeTracingSProxy.ReqGetMaxLevelInfo(TimeTracingDataManager._currentChapterId);
-                    await TimeTracingSProxy.ReqGetLevelRewardStatus();
-                    await TimeTracingSProxy.ReqGetSuitRewardStatus();
-                }
                 InstanceZonesController.OnFinishStoryLevel(InstanceZonesDataManager.currentLevelCfgId, _resultData.FirstPass, true);
                 //尝试显示奖励
                 BonusController.TryShowBonusList(_resultData.BonusList);

GameClient/Assets/Game/HotUpdate/Views/PopWindow/ExchangeGoodsView.cs

@@ -9,7 +9,7 @@ namespace GFGGame
     {
         private UI_ExchangeGoodsUI _ui;
         private int _skillId = 0;
-        private long _nowCount = 0;  //当前选择的数量
+        private long _nowCount = 1;  //当前选择的数量
         private long _maxCount = 0;  //可选择的最大数量
         
         public override void Dispose()
@@ -45,12 +45,14 @@ namespace GFGGame
         {
             base.AddEventListener();
             EventAgent.AddEventListener(ConstMessage.ITEM_CHANGED, UpdateItem);
+            EventAgent.AddEventListener(ConstMessage.EXCHANGE_SUCCESS, ShowTips);
         }
 
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
             EventAgent.RemoveEventListener(ConstMessage.ITEM_CHANGED, UpdateItem);
+            EventAgent.RemoveEventListener(ConstMessage.EXCHANGE_SUCCESS, ShowTips);
         }
 
         protected override void OnShown()
@@ -87,7 +89,7 @@ namespace GFGGame
         {
             base.OnHide();
             _maxCount = 0;
-            _nowCount = 0;
+            _nowCount = 1;
             _ui.m_txtChooseLevel.text = _nowCount.ToString();
         }
 
@@ -129,7 +131,10 @@ namespace GFGGame
         {
             _nowCount += 1;
             if (_nowCount > _maxCount)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("消耗不足");
                 _nowCount = _maxCount;
+            }
 
             ReferViewInfo();
             ReferSlide();
@@ -175,7 +180,13 @@ namespace GFGGame
             item.m_QualityType.selectedIndex = itemCfg.rarity - 1;
             UI_ComItem.ProxyEnd();
             _ui.m_txtHasNum.text = "已拥有:" + hasNum;
+            _ui.m_txtHasNum.visible = false;
             _ui.m_listConsume.numItems = itemCfg.param1Arr.Length;
+            ReferViewInfo();
+        }
+        private void ShowTips()
+        {
+            PromptController.Instance.ShowFloatTextPrompt("兑换成功");
         }
     }
 }

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

@@ -268,9 +268,7 @@ namespace GFGGame
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
             MainStoryDataManager.currentLevelCfgId = 100003003;
-            GuideController.TryGuide(_ui.m_level1.target, "TimeTracingShowView", 5, "挑战。");
-            GuideController.TryGuide(_ui.m_btnBack, "TimeTracingShowView", 6, "点击返回。");
-            
+            GuideController.TryGuide(_ui.m_level1.target, "TimeTracingShowView", 5, "挑战。");       
         }
     }
 }

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

@@ -33,14 +33,6 @@ namespace GFGGame
             _ui.m_makeSuitBtn.target.onClick.Add(OnClickMakeSuitBtn);
             _ui.m_switchBtn.target.onClick.Add(OnClickSwitchBtn);
             _ui.m_ruleBtn.onClick.Add(RuleController.ShowRuleView);
-            //预加载套装，对于不同suitid
-            for (int i = 1; i < suitIdList.Count; i++)
-            {
-                if (true)
-                {
-                    PreDownloadManager.Instance.PreDownloadSuitRes(suitIdList[i], ResType.Both, new int[] { ConstDressUpItemType.BEI_JING }, false);
-                }
-            }
         }
         protected override void AddEventListener()
         {
@@ -164,9 +156,9 @@ namespace GFGGame
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
             GuideController.TryGuide(_ui.m_challgeBtn, "TimeTracingShowView", 4, "进入副本。");
-            GuideController.TryGuide(_ui.m_switchBtn.target, "TimeTracingShowView", 7, "点击选择副本。");
-            GuideController.TryGuide(_ui.m_btnBack, "TimeTracingShowView", 8, "点击返回。");
-            GuideController.TryCompleteGuide("TimeTracingShowView", 8);
+            GuideController.TryGuide(_ui.m_switchBtn.target, "TimeTracingShowView", 6, "点击选择副本。");
+            GuideController.TryGuide(_ui.m_btnBack, "TimeTracingShowView", 7, "点击返回。");
+            GuideController.TryCompleteGuide("TimeTracingShowView", 7);
         }
     }
 }

GameClient/Assets/ResIn/UUI/UILuckyBox.prefab

@@ -273,10 +273,10 @@ RectTransform:
   m_Father: {fileID: 8091540498621025810}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 1, y: 0.5}
-  m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -217, y: -1195.1}
-  m_SizeDelta: {x: 74, y: 54}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: -188, y: 248}
+  m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6248673393164723626
 CanvasRenderer:
@@ -306,7 +306,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 2a55691c2480fc542b99763c136a6021, type: 3}
+  m_Sprite: {fileID: 21300000, guid: bb732211d265cf74fb39dbcb0300a188, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1

GameClient/Assets/ResIn/UUI/bt_tiaoguo.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: bb732211d265cf74fb39dbcb0300a188
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: