引导

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

@@ -17,7 +17,7 @@ namespace GFGGame
             bool isAllGuideFinish = false;
             for (int i = 0; i < GuideCfgArray.Instance.dataArray.Length; i++)
             {
-                if (GuideDataManager.GetGuideCountCopy(GuideCfgArray.Instance.dataArray[i].key) <= 0)
+                if (GuideDataManager.IsGuideFinish(GuideCfgArray.Instance.dataArray[i].key) <= 0)
                 {
                     isAllGuideFinish = false;
                     break;
@@ -78,7 +78,7 @@ namespace GFGGame
         }
         private static void ShowGuideByIndex(GObject target, string guideStr = null, int yTxt = 0, bool isOptionalGuide = false, float devWidth = 0, float devHeight = 0, int guideId = 0, int index = 0)
         {
-            HideGuideIndex();
+            HideGuide();
             if (GameGlobal.skipGuide)
             {
                 return;
@@ -89,7 +89,7 @@ namespace GFGGame
         public static bool TryCompleteGuideIndex(int guideId, int index)
         {
 
-            HideGuideIndex();
+            HideGuide();
             if (GuideDataManager.TryCompleteGuideIndex(guideId, index))
             {
                 return true;
@@ -107,10 +107,10 @@ namespace GFGGame
             if (result)
             {
                 GuideDataManager.currentGuideId = 0;
-                HideGuideIndex();
+                HideGuide();
             }
         }
-        public static void HideGuideIndex()
+        public static void HideGuide()
         {
             ViewManager.Hide(ViewName.GUIDE_VIEW);
         }

GameClient/Assets/Game/HotUpdate/Data/GuideDataManager.cs

@@ -93,7 +93,7 @@ namespace GFGGame
             _guideDicIndex[guideId][index] = 0;
         }
 
-        public static int GetGuideCountCopy(string guideKey)
+        public static int IsGuideFinish(string guideKey)
         {
             if (GameGlobal.skipGuide) return 1;
 

GameClient/Assets/Game/HotUpdate/Data/MainStoryDataManager.cs

@@ -89,7 +89,7 @@ namespace GFGGame
 
         public static bool CheckOpenMainUI()
         {
-            return InstanceZonesDataManager.CheckLevelPass(100001004) && GuideDataManager.GetGuideCountCopy(ConstGuideId.SINGLE_FIGHT) > 0;
+            return InstanceZonesDataManager.CheckLevelPass(100001004) && GuideDataManager.IsGuideFinish(ConstGuideId.SINGLE_FIGHT) > 0;
         }
 
         //检查指定章节对应的普通章节是否通关

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

@@ -669,7 +669,7 @@ namespace GFGGame
         {
 
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-            if (listTypeItem_SingleFight == null && GuideDataManager.GetGuideCountCopy(ConstGuideId.SINGLE_FIGHT) <= 0 || listTypeItem_BuyClothing == null && GuideDataManager.GetGuideCountCopy(ConstGuideId.BUY_CLOTHING) <= 0)
+            if (listTypeItem_SingleFight == null && GuideDataManager.IsGuideFinish(ConstGuideId.SINGLE_FIGHT) <= 0 || listTypeItem_BuyClothing == null && GuideDataManager.IsGuideFinish(ConstGuideId.BUY_CLOTHING) <= 0)
             {
                 int len = _ui.m_comListType1.m_listType.numChildren;
                 for (int i = 0; i < len; i++)
@@ -679,7 +679,7 @@ namespace GFGGame
                     {
                         int menuID = (int)item.target.data;
                         DressUpMenuItemCfg1 dressUpMenuItemCfg1 = DressUpMenuItemCfg1Array.Instance.GetCfg(menuID);
-                        if (GuideDataManager.GetGuideCountCopy(ConstGuideId.SINGLE_FIGHT) <= 0)
+                        if (GuideDataManager.IsGuideFinish(ConstGuideId.SINGLE_FIGHT) <= 0)
                         {
 
                             if (dressUpMenuItemCfg1.type == ConstDressUpItemType.LIAN_YI_QUN)
@@ -689,7 +689,7 @@ namespace GFGGame
                                 break;
                             }
                         }
-                        else if (GuideDataManager.GetGuideCountCopy(ConstGuideId.BUY_CLOTHING) <= 0)
+                        else if (GuideDataManager.IsGuideFinish(ConstGuideId.BUY_CLOTHING) <= 0)
                         {
                             int type = 0;
                             if (_fightCfg.needItemId > 0) type = ItemUtilCS.GetItemSubType(_fightCfg.needItemId);

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

@@ -549,7 +549,7 @@ namespace GFGGame
         protected override void UpdateToCheckGuide(object param)
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-            if (listTypeItem_FreedomDress == null && GuideDataManager.GetGuideCountCopy(ConstGuideId.FREEDOM_DRESS) <= 0)
+            if (listTypeItem_FreedomDress == null && GuideDataManager.IsGuideFinish(ConstGuideId.FREEDOM_DRESS) <= 0)
             {
                 int len = _ui.m_comListType1.m_listType.numChildren;
                 for (int i = 0; i < len; i++)

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

@@ -128,7 +128,7 @@ namespace GFGGame
             // }
             PhotographDataManager.Instance.SetLayer(null, "refresh");
 
-            if (GuideDataManager.GetGuideCountCopy(ConstGuideId.PHOTOGRAPH) > 0)
+            if (GuideDataManager.IsGuideFinish(ConstGuideId.PHOTOGRAPH) > 0)
             {
                 _ui.m_loaGuide.enabled = false;
                 _ui.m_loaGuide1.enabled = false;

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

@@ -80,7 +80,7 @@ namespace GFGGame
 
         private void ResetStartView()
         {
-            showGuide = GuideDataManager.GetGuideCountCopy(ConstGuideId.LUCKY_BOX) <= 0;
+            showGuide = GuideDataManager.IsGuideFinish(ConstGuideId.LUCKY_BOX) <= 0;
 
             curComStar = null;
             comStars.Clear();

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

@@ -65,7 +65,7 @@ namespace GFGGame
             _prefectCount = 0;
             _mainScore = ScoreSystemData.Instance.GetMainScore();
 
-            if (_index == 0 && GuideDataManager.GetGuideCountCopy(ConstGuideId.SINGLE_FIGHT) <= 0)//引导中禁止自动战斗
+            if (_index == 0 && GuideDataManager.IsGuideFinish(ConstGuideId.SINGLE_FIGHT) <= 0)//引导中禁止自动战斗
             {
                 EquipDataCache.cacher.fightSpeed = 1;
                 EquipDataCache.cacher.autoPlay = false;
@@ -105,7 +105,7 @@ namespace GFGGame
             _ui.m_comClickCircle.target.visible = true;
 
 
-            if (_index == 0 && GuideDataManager.GetGuideCountCopy(ConstGuideId.SINGLE_FIGHT) <= 0)
+            if (_index == 0 && GuideDataManager.IsGuideFinish(ConstGuideId.SINGLE_FIGHT) <= 0)
             {
                 _ui.m_comClickCircle.m_loaCircle.touchable = false;
                 _ui.m_comClickCircle.m_t0.Play(1, 0, 0, _playTime / 2, () =>

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

@@ -83,16 +83,19 @@ namespace GFGGame
             });
             _ui.m_comMineCircle.target.onClick.Add(() =>
             {
-                if (_index == 0 && GuideDataManager.GetGuideCountCopy(ConstGuideId.TARGET_FIGHT) <= 0 && playStop)
+                _ui.m_btnSkill0.target.touchable = true;
+            });
+
+            _ui.m_btnSkill0.target.onClick.Add(() =>
+            {
+                if (_index == 0 && GuideDataManager.IsGuideFinish(ConstGuideId.TARGET_FIGHT) <= 0 && playStop)
                 {
                     playStop = false;
-                    _ui.m_comTargetCircle.target.visible = false;
-                    _ui.m_comMineCircle.target.visible = false;
+                    // _ui.m_comTargetCircle.target.visible = false;
+                    // _ui.m_comMineCircle.target.visible = false;
 
                     _ui.m_comMineCircle.m_t0.Play(CircleScoreEnd);
                     _ui.m_comTargetCircle.m_t0.Play();
-                    _ui.m_btnSkill0.target.touchable = true;
-
                 }
             });
             _ui.m_btnSpeedUp.onClick.Add(OnBtnSpeedUp);
@@ -128,7 +131,7 @@ namespace GFGGame
             _mainScore = ScoreSystemData.Instance.GetMainScore();
             _targetMainScore = fightCfg.targetMainScore;
 
-            if (_index == 0 && GuideDataManager.GetGuideCountCopy(ConstGuideId.TARGET_FIGHT) <= 0)
+            if (_index == 0 && GuideDataManager.IsGuideFinish(ConstGuideId.TARGET_FIGHT) <= 0)
             {
                 _ui.m_btnSkill0.target.touchable = false;
             }
@@ -139,7 +142,7 @@ namespace GFGGame
         {
             Reset();
 
-            if (_index == 0 && GuideDataManager.GetGuideCountCopy(ConstGuideId.TARGET_FIGHT) <= 0)//引导中禁止自动战斗
+            if (_index == 0 && GuideDataManager.IsGuideFinish(ConstGuideId.TARGET_FIGHT) <= 0)//引导中禁止自动战斗
             {
                 EquipDataCache.cacher.fightSpeed = 1;
                 EquipDataCache.cacher.autoPlay = false;
@@ -236,7 +239,7 @@ namespace GFGGame
 
             _ui.m_comTargetCircle.target.visible = true;
             _ui.m_comTargetCircle.m_txtPart.text = FightScoreCfgArray.Instance.GetCfg(_index + 1).name;
-            if (_index == 0 && GuideDataManager.GetGuideCountCopy(ConstGuideId.TARGET_FIGHT) <= 0)
+            if (_index == 0 && GuideDataManager.IsGuideFinish(ConstGuideId.TARGET_FIGHT) <= 0)
             {
                 _ui.m_comMineCircle.m_t0.Play(1, 0, 0, 0.75f, () =>
                 {