引导

GameClient/Assets/Game/CSShare

@@ -1 +1 @@
-Subproject commit a306c5f1360413ed22382daa3b492a6ad8534055
+Subproject commit 7672b26a41f28101af7075414424d6c784acfba4

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

@@ -14,6 +14,8 @@ namespace GFGGame
         public const int TIPS_TAGS_FIGHT = 16;//提示标签
         public const int CARD_UP_STAR = 17;//词牌升星
         public const int PHOTOGRAPH_GUIDE = 18;//引导拍照
+        public const int FIGHT_RESULT_TIPS_GUIDE = 19;//战斗结束提示语
+
 
         public const int MAIN_UI_BTN_STORY = 5;
         public const int CHAPTER_RESULT_VIEW = 6;

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

@@ -523,9 +523,12 @@ namespace GFGGame
         private void OnClickBtnPhoto()
         {
 
+            if (!ViewManager.Show<PhotographView>())
+            {
+                return;
+            }
             _ui.target.visible = false;
             this._sceneObject.gameObject.SetActive(false);
-            ViewManager.Show<PhotographView>();
         }
         private void UpdateScene()
         {

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

@@ -127,7 +127,7 @@ namespace GFGGame
         {
             base.OnHide();
             GuideController.TryCompleteGuide(ConstGuideId.CHAPTER_RESULT_VIEW);
-            GuideController.TryCompleteGuide(ConstGuideId.TARGET_FIGHT_GUIDE);
+            GuideController.TryCompleteGuide(ConstGuideId.FIGHT_RESULT_TIPS_GUIDE);
             Timers.inst.Remove(AddExp);
             if (_sceneObject != null)
             {
@@ -176,7 +176,7 @@ namespace GFGGame
             {
                 txt = "你太厉害了，初次对战就获得了这么好的战绩，继续加油吧";
             }
-            GuideController.TryGuideByGuideId(null, ConstGuideId.TARGET_FIGHT_GUIDE, 2, false, txt, targetY);
+            GuideController.TryGuideByGuideId(null, ConstGuideId.FIGHT_RESULT_TIPS_GUIDE, 2, false, txt, targetY);
         }
 
     }

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

@@ -235,10 +235,10 @@ namespace GFGGame
                 isOpen = false;
 
             });
-            List<string> list = new List<string>();
-            list.Add("GFGGame.ClothingShopView");
-            list.Add("GFGGame.LuckyBoxView");
-            ViewManager.Show<FunctionOpenView>(list);
+            // List<string> list = new List<string>();
+            // list.Add("GFGGame.ClothingShopView");
+            // list.Add("GFGGame.LuckyBoxView");
+            // ViewManager.Show<FunctionOpenView>(list);
         }
 
 

GameClient/Assets/Game/HotUpdate/Views/ViewManager.cs

@@ -51,15 +51,16 @@ namespace GFGGame
         /// <param name="hideOthers">ÊÇ·ñ¹Ø±ÕÆäËûÊÓͼ</param>
         public static void Show(string viewName, object viewData = null, object[] goBackParams = null, bool hideOthers = false, bool resetGobackParams = false)
         {
+            if (!FunctionOpenDataManager.Instance.CheckIsFunOpenBgViewName(viewName))
+            {
+                return;
+            }
             if (hideOthers)
             {
                 HideAllView(viewName);
             }
             UIView obj = null;
-            if (!FunctionOpenDataManager.Instance.CheckIsFunOpenBgViewName(viewName))
-            {
-                return;
-            }
+
             if (_viewDic.ContainsKey(viewName))
             {
                 obj = _viewDic[viewName];
@@ -97,12 +98,12 @@ namespace GFGGame
 
         }
 
-        public static void Show<T>(object viewData = null, object[] goBackParams = null, bool hideOthers = false, bool resetGobackParams = false) where T : class, new()
+        public static bool Show<T>(object viewData = null, object[] goBackParams = null, bool hideOthers = false, bool resetGobackParams = false) where T : class, new()
         {
             string viewName = typeof(T).FullName;
             if (!FunctionOpenDataManager.Instance.CheckIsFunOpenBgViewName(viewName))
             {
-                return;
+                return false;
             }
             if (hideOthers)
             {
@@ -143,7 +144,7 @@ namespace GFGGame
                     }
                 }
             }
-
+            return true;
         }
 
         public static void Hide(string viewName)