Merge branch 'master' of http://10.108.64.190:3000/gfg/client

GameClient/Assets/Game/HotUpdate/Views/ClothingDecompose/ClothingDecomposeView.cs

@@ -98,14 +98,14 @@ namespace GFGGame
             //    _ui.m_listTab.selectedIndex = 0;
             //    OnClickBtnRarity(ConstDressRarity.Rarity_FANPIN);
             //}
-            Timers.inst.AddUpdate(CheckGuide);
+            //Timers.inst.AddUpdate(CheckGuide);
         }
 
         protected override void OnHide()
         {
             base.OnHide();
             _valueBarController.OnHide();
-            Timers.inst.Remove(CheckGuide);
+            //Timers.inst.Remove(CheckGuide);
         }
 
         private void OnClickBtnRarity(int rarity)
@@ -404,7 +404,7 @@ namespace GFGGame
             //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, "回到绣坊界面。");
         }
     }
 }

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

@@ -81,7 +81,7 @@ namespace GFGGame
             _ui = UI_ClothingSyntheticUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
-            layer = ConstViewLayer.TOP;
+            //layer = ConstViewLayer.TOP;
             //isReturnView = true;
             //this.clickBlankToClose = false;
 

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

@@ -6,7 +6,7 @@ using System.Collections.Generic;
 
 namespace GFGGame
 {
-    public class SuitSyntheticView : BaseWindow
+    public class SuitSyntheticView : BaseView
     {
 
         private UI_ClothingSyntheticListUI _ui;

GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpFightView.cs

@@ -386,7 +386,7 @@ namespace GFGGame
         private void OnClickListType1Item(EventContext context)
         {
 
-            // GuideController.HideGuide();
+             //GuideController.HideGuide();
             GObject typeItem = context.data as GObject;
             int order = (int)typeItem.data;
             DressUpMenuItemCfg1 item1 = DressUpMenuItemCfg1Array.Instance.dataArray[order - 1];
@@ -1492,12 +1492,12 @@ namespace GFGGame
             GuideController.TryCompleteGuide(ConstGuideId.FIGHT_TIPS, 1);
 
             GuideController.TryGuide(_ui.m_btnRecommend, ConstGuideId.AUTOPLAY_FIGHT, 1, "", -1, true, 0, true, true);//这个引导自动完成，测试中策划要求件推荐搭配引导提前，为避免意外，没有改引导表，而是直接吧推荐搭配加到买必须品的引导力，这个引导自动完成
-            if (GuideDataManager.currentGuideId == GuideCfgArray.Instance.GetCfg(ConstGuideId.AUTOPLAY_FIGHT).id) GuideController.TryCompleteGuideIndex(ConstGuideId.AUTOPLAY_FIGHT, 1);
-            GuideController.TryCompleteGuide(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.TryGuide(_ui.m_compNeed.target, ConstGuideId.CLOTHING_SYNTHETIC, 1, "当提示有\"必需品\"时。需要穿上对应物品才能通关",-1,false);
-            //GuideController.TryCompleteGuide(ConstGuideId.CLOTHING_SYNTHETIC, 7);
-
         }
 
         protected override void TryCompleteGuide()