瀏覽代碼

新手引导修改,摘星换底图

huangxiaoyue 1 年之前
父節點
當前提交
231a934426

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Controller/GuideController.cs

@@ -84,6 +84,7 @@ namespace GFGGame
             GRoot.inst.touchable = false;
             GRoot.inst.touchable = false;
             bool isStoryLevelGuide = cfg.storyLevelId > 0;
             bool isStoryLevelGuide = cfg.storyLevelId > 0;
             bool isFinishCurId = StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_GUIDE + cfg.id) > 0;//当前引导未完成
             bool isFinishCurId = StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_GUIDE + cfg.id) > 0;//当前引导未完成
+
             bool isFinishPriorId = cfg.priorId <= 0 || StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_GUIDE + cfg.priorId) > 0;//前置引导已完成
             bool isFinishPriorId = cfg.priorId <= 0 || StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_GUIDE + cfg.priorId) > 0;//前置引导已完成
             bool isFinishCurIndex = GuideDataManager.IsGuideIndexFinish(cfg.id, index) == true;//当前index未完成
             bool isFinishCurIndex = GuideDataManager.IsGuideIndexFinish(cfg.id, index) == true;//当前index未完成
             bool isFinishPriorIndex = !checkPriorIndex || checkPriorIndex && GuideDataManager.IsGuideIndexFinish(cfg.id, index - 1) == true;//前置index已完成
             bool isFinishPriorIndex = !checkPriorIndex || checkPriorIndex && GuideDataManager.IsGuideIndexFinish(cfg.id, index - 1) == true;//前置index已完成

+ 4 - 5
GameClient/Assets/Game/HotUpdate/Views/ClothingDecompose/ClothingDecomposeView.cs

@@ -386,8 +386,7 @@ namespace GFGGame
 
 
         private void CheckGuide(object param)
         private void CheckGuide(object param)
         {
         {
-            if (GuideDataManager.IsGuideFinish(ConstGuideId.CLOTHING_DECOMPOSE) <= 0
-            || GuideDataManager.IsGuideFinish(ConstGuideId.CLOTHING_SYNTHETIC) <= 0)
+            if (GuideDataManager.IsGuideFinish(ConstGuideId.CLOTHING_SYNTHETIC) <= 0)
             {
             {
                 UpdateToCheckGuide(null);
                 UpdateToCheckGuide(null);
             }
             }
@@ -402,9 +401,9 @@ namespace GFGGame
 
 
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
 
 
-            GuideController.TryGuide(_ui.m_list, ConstGuideId.CLOTHING_DECOMPOSE, 4, "选择重复获得的服饰部件。", 0);
-            GuideController.TryGuide(_ui.m_btnDecompose, ConstGuideId.CLOTHING_DECOMPOSE, 5, "分解获得的材料可用于新服饰合成。");
-            GuideController.TryCompleteGuide(ConstGuideId.CLOTHING_DECOMPOSE, 5);
+            //GuideController.TryGuide(_ui.m_list, ConstGuideId.CLOTHING_DECOMPOSE, 4, "选择重复获得的服饰部件。", 0);
+            //GuideController.TryGuide(_ui.m_btnDecompose, ConstGuideId.CLOTHING_DECOMPOSE, 5, "分解获得的材料可用于新服饰合成。");
+            //GuideController.TryCompleteGuide(ConstGuideId.CLOTHING_DECOMPOSE, 5);
             GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.CLOTHING_SYNTHETIC, 1, "回到绣坊界面。");
             GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.CLOTHING_SYNTHETIC, 1, "回到绣坊界面。");
         }
         }
     }
     }

+ 4 - 4
GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/ClothingSyntheticView.cs

@@ -429,14 +429,14 @@ namespace GFGGame
                 }
                 }
             }
             }
 
 
-            bool guide = GuideController.TryGuide(_ui.m_listClothing, ConstGuideId.CLOTHING_SYNTHETIC, 4, "找到需要合成的物品。", itemIndex);
+            bool guide = GuideController.TryGuide(_ui.m_listClothing, ConstGuideId.CLOTHING_SYNTHETIC, 3, "找到需要合成的物品。", itemIndex);
             if (guide) _ui.m_listClothing.ScrollToView(itemIndex);
             if (guide) _ui.m_listClothing.ScrollToView(itemIndex);
 
 
-            GuideController.TryGuide(_ui.m_listMaterias, ConstGuideId.CLOTHING_SYNTHETIC, 5, "这里可以查看合成需要的材料,和材料的获取途径。", 0);
+            GuideController.TryGuide(_ui.m_listMaterias, ConstGuideId.CLOTHING_SYNTHETIC, 4, "这里可以查看合成需要的材料,和材料的获取途径。", 0);
             UI_MateriasListItem.ProxyEnd();
             UI_MateriasListItem.ProxyEnd();
 
 
-            GuideController.TryGuide(_ui.m_btnProduction, ConstGuideId.CLOTHING_SYNTHETIC, 6, "点击获得新的服饰。");
-            GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.CLOTHING_SYNTHETIC, 7, "获得新衣服啦,继续通关主线剧情吧。");
+            GuideController.TryGuide(_ui.m_btnProduction, ConstGuideId.CLOTHING_SYNTHETIC, 5, "点击获得新的服饰。");
+            GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.CLOTHING_SYNTHETIC, 6, "获得新衣服啦,继续通关主线剧情吧。");
         }
         }
     }
     }
 }
 }

+ 2 - 2
GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/SuitSyntheticView.cs

@@ -60,13 +60,13 @@ namespace GFGGame
             // _ui.m_listMenu.GetChildAt(1).visible = false;
             // _ui.m_listMenu.GetChildAt(1).visible = false;
             UpdateSuitList();
             UpdateSuitList();
             UpdateRedDot();
             UpdateRedDot();
-            Timers.inst.AddUpdate(CheckGuide);
+            //Timers.inst.AddUpdate(CheckGuide);
         }
         }
 
 
         protected override void OnHide()
         protected override void OnHide()
         {
         {
             base.OnHide();
             base.OnHide();
-            Timers.inst.Remove(CheckGuide);
+            //Timers.inst.Remove(CheckGuide);
 
 
         }
         }
         protected override void RemoveEventListener()
         protected override void RemoveEventListener()

+ 14 - 5
GameClient/Assets/Game/HotUpdate/Views/Common/Controller/LuckyBoxController.cs

@@ -90,11 +90,20 @@ namespace GFGGame
             _comModel.m_loaBg.url = ResPathUtil.GetBgImgPath(_luckyBoxCfg.bgResArr[_bgIndex]);
             _comModel.m_loaBg.url = ResPathUtil.GetBgImgPath(_luckyBoxCfg.bgResArr[_bgIndex]);
             if (_luckyBoxCfg.resArr.Length > 0)
             if (_luckyBoxCfg.resArr.Length > 0)
             {
             {
-                int direction = _luckyBoxCfg.scaleArr[_modelIndex] >= 0 ? 1 : -1;
-                float scale = _luckyBoxCfg.scaleArr.Length > 0 ? Math.Abs(_luckyBoxCfg.scaleArr[_modelIndex]) / 10000f : 1;
-                comRes.m_loaRes.url = string.Format("ui://LuckyBox/{0}", _luckyBoxCfg.resArr[_modelIndex]);
-                comRes.m_loaRes.SetPosition(_luckyBoxCfg.posArr[_modelIndex][0], _luckyBoxCfg.posArr[_modelIndex][1], 1);
-                comRes.m_loaRes.SetScale(direction * scale, scale);
+                //comRes.m_loaRes.url = string.Format("ui://LuckyBox/{0}", _luckyBoxCfg.resArr[_modelIndex]);
+                comRes.m_loaRes.url = ResPathUtil.GetBgImgPath(_luckyBoxCfg.resArr[_modelIndex]);
+                if(_luckyBoxCfg.posArr.Length>0)
+                    comRes.m_loaRes.SetPosition(_luckyBoxCfg.posArr[_modelIndex][0], _luckyBoxCfg.posArr[_modelIndex][1], 1);
+                else
+                    comRes.m_loaRes.SetPosition(115, 80, 1);
+
+                if (_luckyBoxCfg.scaleArr.Length < 0) { 
+                    int direction = _luckyBoxCfg.scaleArr[_modelIndex] >= 0 ? 1 : -1;
+                    float scale = _luckyBoxCfg.scaleArr.Length > 0 ? Math.Abs(_luckyBoxCfg.scaleArr[_modelIndex]) / 10000f : 1;
+                    comRes.m_loaRes.SetScale(direction * scale, scale);
+                }
+                comRes.m_loaRes.SetScale(1.2f, 1.2f);
+
             }
             }
             else if (_luckyBoxCfg.suitIdArr.Length > 0)
             else if (_luckyBoxCfg.suitIdArr.Length > 0)
             {
             {

+ 6 - 2
GameClient/Assets/Game/HotUpdate/Views/CommonGame/GoodsItemTipsView.cs

@@ -153,7 +153,7 @@ namespace GFGGame
 
 
         private void CheckGuide(object param)
         private void CheckGuide(object param)
         {
         {
-            if (_ui.m_comTipsApproach.m_list.numItems > 0 && GuideDataManager.IsGuideFinish(ConstGuideId.BUY_CLOTHING) <= 0)
+            if ((_ui.m_comTipsApproach.m_list.numItems > 0 && (GuideDataManager.IsGuideFinish(ConstGuideId.BUY_CLOTHING) <= 0) || GuideDataManager.IsGuideFinish(ConstGuideId.CLOTHING_SYNTHETIC) <= 0))
             {
             {
                 UpdateToCheckGuide(null);
                 UpdateToCheckGuide(null);
             }
             }
@@ -165,12 +165,14 @@ namespace GFGGame
         protected override void UpdateToCheckGuide(object param)
         protected override void UpdateToCheckGuide(object param)
         {
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
+
             List<string[]> _approachDatas = _ui.m_comTipsApproach.m_list.data as List<string[]>;
             List<string[]> _approachDatas = _ui.m_comTipsApproach.m_list.data as List<string[]>;
             if (_approachDatas == null) return;
             if (_approachDatas == null) return;
             GComponent obj = null;
             GComponent obj = null;
+
             for (int i = 0; i < _approachDatas.Count; i++)
             for (int i = 0; i < _approachDatas.Count; i++)
             {
             {
-                if (_approachDatas[i][0] == ConstFunctionId.FU_ZHUANG_DIAN)
+                if (_approachDatas[i][0] == ConstFunctionId.FU_ZHUANG_DIAN || _approachDatas[i][0] == ConstFunctionId.FU_ZHUANG_HE_CHENG)
                 {
                 {
                     _ui.m_comTipsApproach.m_list.ScrollToView(i);
                     _ui.m_comTipsApproach.m_list.ScrollToView(i);
                     UI_ListSourceItem item = UI_ListSourceItem.Proxy(_ui.m_comTipsApproach.m_list.GetChildAt(i));
                     UI_ListSourceItem item = UI_ListSourceItem.Proxy(_ui.m_comTipsApproach.m_list.GetChildAt(i));
@@ -179,7 +181,9 @@ namespace GFGGame
                     break;
                     break;
                 }
                 }
             }
             }
+
             GuideController.TryGuide(obj, ConstGuideId.BUY_CLOTHING, 4, "该物品可以在服装店购买,点开服装店看看。");
             GuideController.TryGuide(obj, ConstGuideId.BUY_CLOTHING, 4, "该物品可以在服装店购买,点开服装店看看。");
+            GuideController.TryGuide(obj, ConstGuideId.CLOTHING_SYNTHETIC, 2, "该物品可以在绣坊-服装合成哦");
         }
         }
     }
     }
 }
 }

+ 5 - 1
GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpFightView.cs

@@ -1435,7 +1435,8 @@ namespace GFGGame
         {
         {
             if (GuideDataManager.IsGuideFinish(ConstGuideId.BUY_CLOTHING) <= 0
             if (GuideDataManager.IsGuideFinish(ConstGuideId.BUY_CLOTHING) <= 0
              || GuideDataManager.IsGuideFinish(ConstGuideId.START_FIGHT) <= 0
              || GuideDataManager.IsGuideFinish(ConstGuideId.START_FIGHT) <= 0
-             || GuideDataManager.IsGuideFinish(ConstGuideId.AUTOPLAY_FIGHT) <= 0)
+             || GuideDataManager.IsGuideFinish(ConstGuideId.AUTOPLAY_FIGHT) <= 0
+             || GuideDataManager.IsGuideFinish(ConstGuideId.CLOTHING_SYNTHETIC) <= 0)
             {
             {
                 UpdateToCheckGuide(null);
                 UpdateToCheckGuide(null);
             }
             }
@@ -1494,6 +1495,9 @@ namespace GFGGame
             if (GuideDataManager.currentGuideId == GuideCfgArray.Instance.GetCfg(ConstGuideId.AUTOPLAY_FIGHT).id) GuideController.TryCompleteGuideIndex(ConstGuideId.AUTOPLAY_FIGHT, 1);
             if (GuideDataManager.currentGuideId == GuideCfgArray.Instance.GetCfg(ConstGuideId.AUTOPLAY_FIGHT).id) GuideController.TryCompleteGuideIndex(ConstGuideId.AUTOPLAY_FIGHT, 1);
             GuideController.TryCompleteGuide(ConstGuideId.AUTOPLAY_FIGHT, 1);
             GuideController.TryCompleteGuide(ConstGuideId.AUTOPLAY_FIGHT, 1);
 
 
+            GuideController.TryGuide(_ui.m_compNeed.target, ConstGuideId.CLOTHING_SYNTHETIC, 1, "当提示有\"必需品\"时。需要穿上对应物品才能通关",-1,false);
+            //GuideController.TryCompleteGuide(ConstGuideId.CLOTHING_SYNTHETIC, 7);
+
         }
         }
 
 
         protected override void TryCompleteGuide()
         protected override void TryCompleteGuide()

+ 0 - 1
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryCardChoose.cs

@@ -186,7 +186,6 @@ namespace GFGGame
         {
         {
             CardData cardData = cardList[index];
             CardData cardData = cardList[index];
             UI_ListCardItem item = UI_ListCardItem.Proxy(obj); // obj as GButton;
             UI_ListCardItem item = UI_ListCardItem.Proxy(obj); // obj as GButton;
-
             item.m_txtName.text = cardData.itemCfg.name;
             item.m_txtName.text = cardData.itemCfg.name;
             item.m_comCardMask.m_loaCard.asLoader.url =
             item.m_comCardMask.m_loaCard.asLoader.url =
                 ResPathUtil.GetCardIconPath(cardData.resources[cardData.resIndex]);
                 ResPathUtil.GetCardIconPath(cardData.resources[cardData.resIndex]);

+ 2 - 2
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryChapterListView.cs

@@ -323,7 +323,7 @@ namespace GFGGame
              || GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_PORCELAIN) <= 0
              || GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_PORCELAIN) <= 0
              || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_1) <= 0
              || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_1) <= 0
              || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_2) <= 0
              || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_2) <= 0
-             || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_3) <= 0
+             //|| GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_3) <= 0
              || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_4) <= 0
              || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_4) <= 0
              || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_5) <= 0
              || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_5) <= 0
              || GuideDataManager.IsGuideFinish(ConstGuideId.ARENA_OPEN) <= 0
              || GuideDataManager.IsGuideFinish(ConstGuideId.ARENA_OPEN) <= 0
@@ -344,7 +344,7 @@ namespace GFGGame
             GuideController.TryGuide(_ui.m_listChapter, ConstGuideId.ENTER_CHAPTER, 4, "", 0, true, _ui.target.height / 2);
             GuideController.TryGuide(_ui.m_listChapter, ConstGuideId.ENTER_CHAPTER, 4, "", 0, true, _ui.target.height / 2);
             GuideController.TryGuide(_ui.m_listChapter, ConstGuideId.ENTER_CHAPTER_1, 3, "", 0, true, _ui.target.height / 2);
             GuideController.TryGuide(_ui.m_listChapter, ConstGuideId.ENTER_CHAPTER_1, 3, "", 0, true, _ui.target.height / 2);
             GuideController.TryGuide(_ui.m_listChapter, ConstGuideId.ENTER_CHAPTER_2, 3, "", 1, true, _ui.target.height / 2);
             GuideController.TryGuide(_ui.m_listChapter, ConstGuideId.ENTER_CHAPTER_2, 3, "", 1, true, _ui.target.height / 2);
-            GuideController.TryGuide(_ui.m_listChapter, ConstGuideId.ENTER_CHAPTER_3, 2, "", 1, true, _ui.target.height / 2);
+            //GuideController.TryGuide(_ui.m_listChapter, ConstGuideId.ENTER_CHAPTER_3, 2, "", 1, true, _ui.target.height / 2);
             GuideController.TryGuide(_ui.m_listChapter, ConstGuideId.ENTER_CHAPTER_4, 3, "", 1, true, _ui.target.height / 2);
             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_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_btnHome, ConstGuideId.STUDIO_PORCELAIN, 1, "点击返回主界面。");

+ 10 - 9
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryChapterView.cs

@@ -428,12 +428,12 @@ namespace GFGGame
              || GuideDataManager.IsGuideFinish(ConstGuideId.UP_CARD_LV) <= 0
              || GuideDataManager.IsGuideFinish(ConstGuideId.UP_CARD_LV) <= 0
              || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_1) <= 0
              || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_1) <= 0
              || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_2) <= 0
              || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_2) <= 0
-             || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_3) <= 0
+             //|| GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_3) <= 0
              || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_4) <= 0
              || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_4) <= 0
              || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_5) <= 0
              || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_5) <= 0
              || GuideDataManager.IsGuideFinish(ConstGuideId.UP_CARD_STAR) <= 0
              || GuideDataManager.IsGuideFinish(ConstGuideId.UP_CARD_STAR) <= 0
-             || GuideDataManager.IsGuideFinish(ConstGuideId.ARENA_OPEN) <= 0
-             || GuideDataManager.IsGuideFinish(ConstGuideId.CLOTHING_DECOMPOSE) <= 0)
+             || GuideDataManager.IsGuideFinish(ConstGuideId.ARENA_OPEN) <= 0)
+             //|| GuideDataManager.IsGuideFinish(ConstGuideId.CLOTHING_DECOMPOSE) <= 0)
             {
             {
                 UpdateToCheckGuide(null);
                 UpdateToCheckGuide(null);
             }
             }
@@ -457,13 +457,13 @@ namespace GFGGame
             bool isGuide4 = GuideController.TryGuide(unPasslevelCom, ConstGuideId.BUY_CLOTHING, 1, "衣服被弄脏了,到机场更衣室换身衣服吧。");
             bool isGuide4 = GuideController.TryGuide(unPasslevelCom, ConstGuideId.BUY_CLOTHING, 1, "衣服被弄脏了,到机场更衣室换身衣服吧。");
             bool isGuide5 = GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.UP_CARD_LV, 1, "点击返回主界面。");
             bool isGuide5 = GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.UP_CARD_LV, 1, "点击返回主界面。");
 
 
-            bool isGuide6 = GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.CLOTHING_DECOMPOSE, 1, "点击返回主界面。");
+            //bool isGuide6 = GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.CLOTHING_DECOMPOSE, 1, "点击返回主界面。");
 
 
             bool isGuide7 = GuideController.TryGuide(unPasslevelCom, ConstGuideId.ENTER_CHAPTER_2, 4, "来继续我们的旅程吧。");
             bool isGuide7 = GuideController.TryGuide(unPasslevelCom, ConstGuideId.ENTER_CHAPTER_2, 4, "来继续我们的旅程吧。");
             GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_2, 4);
             GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_2, 4);
 
 
-            bool isGuide8 = GuideController.TryGuide(unPasslevelCom, ConstGuideId.ENTER_CHAPTER_3, 3, "来继续我们的旅程吧。");
-            GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_3, 3);
+            //bool isGuide8 = GuideController.TryGuide(unPasslevelCom, ConstGuideId.ENTER_CHAPTER_3, 3, "来继续我们的旅程吧。");
+            //GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_3, 3);
 
 
             bool isGuide10 = GuideController.TryGuide(unPasslevelCom, ConstGuideId.ENTER_CHAPTER_4, 4, "来继续我们的旅程吧。");
             bool isGuide10 = GuideController.TryGuide(unPasslevelCom, ConstGuideId.ENTER_CHAPTER_4, 4, "来继续我们的旅程吧。");
             GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_4, 4);
             GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_4, 4);
@@ -474,7 +474,8 @@ namespace GFGGame
             bool isGuide9 = GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.UP_CARD_STAR, 1, "点击返回主界面。");
             bool isGuide9 = GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.UP_CARD_STAR, 1, "点击返回主界面。");
             bool isGuide12 = GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.ARENA_OPEN, 1, "点击返回主界面。");
             bool isGuide12 = GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.ARENA_OPEN, 1, "点击返回主界面。");
 
 
-            _ui.m_chapter.target.scrollPane.touchEffect = !isGuide0 && !isGuide1 && !isGuide2 && !isGuide3 && !isGuide4 && !isGuide5 && !isGuide6 && !isGuide7 && !isGuide8 && !isGuide9 && !isGuide10;
+            //&& !isGuide6 && !isGuide8
+            _ui.m_chapter.target.scrollPane.touchEffect = !isGuide0 && !isGuide1 && !isGuide2 && !isGuide3 && !isGuide4 && !isGuide5 && !isGuide7  && !isGuide9 && !isGuide10;
 
 
         }
         }
         protected override void TryCompleteGuide()
         protected override void TryCompleteGuide()
@@ -490,8 +491,8 @@ namespace GFGGame
             GuideController.TryCompleteGuideIndex(ConstGuideId.ENTER_CHAPTER_2, 4);
             GuideController.TryCompleteGuideIndex(ConstGuideId.ENTER_CHAPTER_2, 4);
             GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_2, 4);
             GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_2, 4);
             // GuideCfg cfg3 = GuideCfgArray.Instance.GetCfg(ConstGuideId.ENTER_CHAPTER_3);
             // GuideCfg cfg3 = GuideCfgArray.Instance.GetCfg(ConstGuideId.ENTER_CHAPTER_3);
-            GuideController.TryCompleteGuideIndex(ConstGuideId.ENTER_CHAPTER_3, 3);
-            GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_3, 3);
+            //GuideController.TryCompleteGuideIndex(ConstGuideId.ENTER_CHAPTER_3, 3);
+            //GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_3, 3);
             // GuideCfg cfg4 = GuideCfgArray.Instance.GetCfg(ConstGuideId.ENTER_CHAPTER_4);
             // GuideCfg cfg4 = GuideCfgArray.Instance.GetCfg(ConstGuideId.ENTER_CHAPTER_4);
             GuideController.TryCompleteGuideIndex(ConstGuideId.ENTER_CHAPTER_4, 4);
             GuideController.TryCompleteGuideIndex(ConstGuideId.ENTER_CHAPTER_4, 4);
             GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_4, 4);
             GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_4, 4);

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryLevelInfoView.cs

@@ -356,7 +356,7 @@ namespace GFGGame
         protected override void TryCompleteGuide()
         protected override void TryCompleteGuide()
         {
         {
             // GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.CLOTHING_SYNTHETIC);
             // GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.CLOTHING_SYNTHETIC);
-            GuideController.TryCompleteGuideIndex(ConstGuideId.CLOTHING_SYNTHETIC, 3);
+            //GuideController.TryCompleteGuideIndex(ConstGuideId.CLOTHING_SYNTHETIC, 3);
         }
         }
     }
     }
 }
 }

+ 7 - 7
GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -936,8 +936,8 @@ namespace GFGGame
             MainDataManager.Instance.CanSwipe = true;
             MainDataManager.Instance.CanSwipe = true;
             GRoot.inst.touchable = true;
             GRoot.inst.touchable = true;
             if (GuideDataManager.IsGuideFinish(ConstGuideId.FREEDOM_DRESS) <= 0
             if (GuideDataManager.IsGuideFinish(ConstGuideId.FREEDOM_DRESS) <= 0
-                || GuideDataManager.IsGuideFinish(ConstGuideId.CLOTHING_DECOMPOSE) <= 0
-                || GuideDataManager.IsGuideFinish(ConstGuideId.CLOTHING_SYNTHETIC) <= 0
+                //|| GuideDataManager.IsGuideFinish(ConstGuideId.CLOTHING_DECOMPOSE) <= 0
+                //|| GuideDataManager.IsGuideFinish(ConstGuideId.CLOTHING_SYNTHETIC) <= 0
                 || GuideDataManager.IsGuideFinish(ConstGuideId.UP_CARD_LV) <= 0
                 || GuideDataManager.IsGuideFinish(ConstGuideId.UP_CARD_LV) <= 0
                 || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER) <= 0
                 || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER) <= 0
                 || GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_FILING) <= 0
                 || GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_FILING) <= 0
@@ -945,7 +945,7 @@ namespace GFGGame
                 || GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_PORCELAIN) <= 0
                 || GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_PORCELAIN) <= 0
                 || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_1) <= 0
                 || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_1) <= 0
                 || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_2) <= 0
                 || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_2) <= 0
-                || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_3) <= 0
+                //|| GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_3) <= 0
                 || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_4) <= 0
                 || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_4) <= 0
                 || GuideDataManager.IsGuideFinish(ConstGuideId.UP_CARD_STAR) <= 0
                 || GuideDataManager.IsGuideFinish(ConstGuideId.UP_CARD_STAR) <= 0
                 || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_5) <= 0
                 || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_5) <= 0
@@ -968,16 +968,16 @@ namespace GFGGame
             GuideController.TryGuide(_ui.m_btnHuanZhuang.target, ConstGuideId.FREEDOM_DRESS, 2, "在这里,自由搭配服饰和分享哦~", -1, false);
             GuideController.TryGuide(_ui.m_btnHuanZhuang.target, ConstGuideId.FREEDOM_DRESS, 2, "在这里,自由搭配服饰和分享哦~", -1, false);
             GuideController.TryGuide(_ui.m_btnMain.target, ConstGuideId.ENTER_CHAPTER, 3, "海市蜃楼,镜花水月,是所有故事开始的地方。", -1, false);
             GuideController.TryGuide(_ui.m_btnMain.target, ConstGuideId.ENTER_CHAPTER, 3, "海市蜃楼,镜花水月,是所有故事开始的地方。", -1, false);
 
 
-            GuideController.TryGuide(_ui.m_btnXiuFang.target, ConstGuideId.CLOTHING_DECOMPOSE, 2, "绣坊里增添了新功能。", -1, false);
+            //GuideController.TryGuide(_ui.m_btnXiuFang.target, ConstGuideId.CLOTHING_DECOMPOSE, 2, "绣坊里增添了新功能。", -1, false);
 
 
-            GuideController.TryGuide(_ui.m_btnXiuFang.target, ConstGuideId.CLOTHING_SYNTHETIC, 1, "进入绣坊界面。", -1, false);
-            GuideController.TryCompleteGuide(ConstGuideId.CLOTHING_SYNTHETIC, 7);
+            //GuideController.TryGuide(_ui.m_btnXiuFang.target, ConstGuideId.CLOTHING_SYNTHETIC, 1, "进入绣坊界面。", -1, false);
+            //GuideController.TryCompleteGuide(ConstGuideId.CLOTHING_SYNTHETIC, 7);
 
 
             GuideController.TryGuide(_ui.m_btnCiPai.target, ConstGuideId.UP_CARD_LV, 2, "“词牌”可进行升级和管理。", -1, false);
             GuideController.TryGuide(_ui.m_btnCiPai.target, ConstGuideId.UP_CARD_LV, 2, "“词牌”可进行升级和管理。", -1, false);
             GuideController.TryGuide(_ui.m_btnMain.target, ConstGuideId.ENTER_CHAPTER_1, 2, "", -1, false);
             GuideController.TryGuide(_ui.m_btnMain.target, ConstGuideId.ENTER_CHAPTER_1, 2, "", -1, false);
 
 
             GuideController.TryGuide(_ui.m_btnMain.target, ConstGuideId.ENTER_CHAPTER_2, 2, "", -1, false);
             GuideController.TryGuide(_ui.m_btnMain.target, ConstGuideId.ENTER_CHAPTER_2, 2, "", -1, false);
-            GuideController.TryGuide(_ui.m_btnMain.target, ConstGuideId.ENTER_CHAPTER_3, 1, "", -1, false);
+            //GuideController.TryGuide(_ui.m_btnMain.target, ConstGuideId.ENTER_CHAPTER_3, 1, "", -1, false);
             GuideController.TryGuide(_ui.m_btnMain.target, ConstGuideId.ENTER_CHAPTER_4, 2, "", -1, false);
             GuideController.TryGuide(_ui.m_btnMain.target, ConstGuideId.ENTER_CHAPTER_4, 2, "", -1, false);
 
 
             GuideController.TryGuide(_ui.m_btnCiPai.target, ConstGuideId.UP_CARD_STAR, 2, "“词牌”可进行升星。", -1, false);
             GuideController.TryGuide(_ui.m_btnCiPai.target, ConstGuideId.UP_CARD_STAR, 2, "“词牌”可进行升星。", -1, false);

+ 3 - 5
GameClient/Assets/Game/HotUpdate/Views/XiuFang/XiuFangView.cs

@@ -110,9 +110,7 @@ namespace GFGGame
         }
         }
         private void CheckGuide(object param)
         private void CheckGuide(object param)
         {
         {
-            if (GuideDataManager.IsGuideFinish(ConstGuideId.CLOTHING_SYNTHETIC) <= 0
-            || GuideDataManager.IsGuideFinish(ConstGuideId.CLOTHING_DECOMPOSE) <= 0
-            || GuideDataManager.IsGuideFinish(ConstGuideId.SUIT_LIST_VIEW) <= 0)
+            if (GuideDataManager.IsGuideFinish(ConstGuideId.SUIT_LIST_VIEW) <= 0)
             {
             {
                 UpdateToCheckGuide(null);
                 UpdateToCheckGuide(null);
             }
             }
@@ -132,9 +130,9 @@ namespace GFGGame
         {
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
 
 
-            GuideController.TryGuide(_ui.m_component.m_btnSuitSynthetic.target, ConstGuideId.CLOTHING_SYNTHETIC, 2, "这里可以查看已获得的服饰图谱。");
+            //GuideController.TryGuide(_ui.m_component.m_btnSuitSynthetic.target, ConstGuideId.CLOTHING_SYNTHETIC, 2, "这里可以查看已获得的服饰图谱。");
 
 
-            GuideController.TryGuide(_ui.m_component.m_btnDecompose.target, ConstGuideId.CLOTHING_DECOMPOSE, 3, "这里可以消耗重复获得的服饰。");
+            //GuideController.TryGuide(_ui.m_component.m_btnDecompose.target, ConstGuideId.CLOTHING_DECOMPOSE, 3, "这里可以消耗重复获得的服饰。");
 
 
 
 
             GuideController.TryGuide(_ui.m_component.m_btnClothingUpgrade.target, ConstGuideId.SUIT_LIST_VIEW, 2, "");
             GuideController.TryGuide(_ui.m_component.m_btnClothingUpgrade.target, ConstGuideId.SUIT_LIST_VIEW, 2, "");