Browse Source

引导修改监听方式添加前置id

zhaoyang 3 years ago
parent
commit
cf100880a2
27 changed files with 145 additions and 185 deletions
  1. 1 1
      GameClient/Assets/Game/CSShare
  2. 19 2
      GameClient/Assets/Game/HotUpdate/Controller/GuideController.cs
  3. 37 20
      GameClient/Assets/Game/HotUpdate/Data/GuideDataManager.cs
  4. 2 3
      GameClient/Assets/Game/HotUpdate/Views/Card/CardDetailView.cs
  5. 1 3
      GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs
  6. 1 3
      GameClient/Assets/Game/HotUpdate/Views/ClothingShop/ClothingShopView.cs
  7. 1 3
      GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/ClothingSyntheticView.cs
  8. 1 3
      GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/SuitSyntheticView.cs
  9. 1 4
      GameClient/Assets/Game/HotUpdate/Views/CommonGame/ApproachOfItemView.cs
  10. 1 3
      GameClient/Assets/Game/HotUpdate/Views/CommonGame/BuyCountView.cs
  11. 1 3
      GameClient/Assets/Game/HotUpdate/Views/CommonGame/GetBonusView.cs
  12. 1 3
      GameClient/Assets/Game/HotUpdate/Views/CommonGame/GetSuitItemVIew.cs
  13. 3 31
      GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpFightView.cs
  14. 1 3
      GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpView.cs
  15. 1 3
      GameClient/Assets/Game/HotUpdate/Views/DressUp/PhotographView.cs
  16. 5 16
      GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxStarView.cs
  17. 1 6
      GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxView.cs
  18. 1 3
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryCardChoose.cs
  19. 2 4
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryChapterView.cs
  20. 1 4
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightSingleScoreView.cs
  21. 1 3
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightTargetScoreView.cs
  22. 1 3
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryLevelInfoView.cs
  23. 1 1
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StroyFightResultView.cs
  24. 46 50
      GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs
  25. 13 4
      GameClient/Assets/Game/HotUpdate/Views/UIView.cs
  26. 1 3
      GameClient/Assets/Game/HotUpdate/Views/XiuFang/XiuFangView.cs
  27. BIN
      GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes

+ 1 - 1
GameClient/Assets/Game/CSShare

@@ -1 +1 @@
-Subproject commit 636691841fe8e087929e669d3867a3cf0c6de531
+Subproject commit dc3ebcc633a921372983dbae1623ffb4f941d529

+ 19 - 2
GameClient/Assets/Game/HotUpdate/Controller/GuideController.cs

@@ -686,6 +686,22 @@ namespace GFGGame
             return false;
             return false;
         }
         }
         /*********************************************************************************************************************************/
         /*********************************************************************************************************************************/
+        public static bool IsGuide()
+        {
+
+            bool isAllGuideFinish = false;
+            for (int i = 0; i < GuideCfgArray.Instance.dataArray.Length; i++)
+            {
+                if (GuideDataManager.GetGuideCountCopy(GuideCfgArray.Instance.dataArray[i].key) <= 0)
+                {
+                    isAllGuideFinish = false;
+                    break;
+                }
+                isAllGuideFinish = true;
+            }
+            bool isGuide = GameGlobal.skipGuide == false && !isAllGuideFinish;
+            return isGuide;
+        }
         public static bool useNewGuide = true;
         public static bool useNewGuide = true;
         public static bool TryGuide(GObject target, string guideKey, int index, string guideStr = null, bool isList = false, int listIndex = 0, bool checkIndex = true, bool needUpdate = false, int yTxt = 0, float devWidth = 0, float devHeight = 0)
         public static bool TryGuide(GObject target, string guideKey, int index, string guideStr = null, bool isList = false, int listIndex = 0, bool checkIndex = true, bool needUpdate = false, int yTxt = 0, float devWidth = 0, float devHeight = 0)
         {
         {
@@ -694,6 +710,7 @@ namespace GFGGame
             GuideCfg cfg = GuideCfgArray.Instance.GetCfg(guideKey);
             GuideCfg cfg = GuideCfgArray.Instance.GetCfg(guideKey);
 
 
             if ((GuideDataManager.GetGuideCountCopy(guideKey) <= 0
             if ((GuideDataManager.GetGuideCountCopy(guideKey) <= 0
+            && (cfg.priorId <= 0 || cfg.priorId > 0 && (GuideDataManager.GetGuideCountCopy(cfg.priorId) > 0))
             && (!checkIndex || checkIndex && GuideDataManager.IsGuideIndexFinish(cfg.id, index - 1) == true && GuideDataManager.IsGuideIndexFinish(cfg.id, index) == false)
             && (!checkIndex || checkIndex && GuideDataManager.IsGuideIndexFinish(cfg.id, index - 1) == true && GuideDataManager.IsGuideIndexFinish(cfg.id, index) == false)
             && (GuideDataManager.currentGuideId == 0 || GuideDataManager.currentGuideId == cfg.id && GuideDataManager.currentGuideIdIndex != index)
             && (GuideDataManager.currentGuideId == 0 || GuideDataManager.currentGuideId == cfg.id && GuideDataManager.currentGuideIdIndex != index)
             && (StoryDataManager.currentChapter == 0 || StoryDataManager.CheckCurrentLevelPass() == false)
             && (StoryDataManager.currentChapter == 0 || StoryDataManager.CheckCurrentLevelPass() == false)
@@ -725,7 +742,7 @@ namespace GFGGame
                         return false;
                         return false;
                     }
                     }
                 }
                 }
-                ShowGuideIndex(target, needUpdate, guideStr, yTxt, cfg.optionalGuide == 1, devWidth, devHeight, GuideDataManager.currentGuideId, GuideDataManager.currentGuideIdIndex);
+                ShowGuideByIndex(target, needUpdate, guideStr, yTxt, cfg.optionalGuide == 1, devWidth, devHeight, GuideDataManager.currentGuideId, GuideDataManager.currentGuideIdIndex);
                 if (!checkIndex)
                 if (!checkIndex)
                 {
                 {
                     for (int i = 1; i < index; i++)
                     for (int i = 1; i < index; i++)
@@ -737,7 +754,7 @@ namespace GFGGame
             }
             }
             return false;
             return false;
         }
         }
-        private static void ShowGuideIndex(GObject target, bool needUpdate = false, string guideStr = null, int yTxt = 0, bool isOptionalGuide = false, float devWidth = 0, float devHeight = 0, int guideId = 0, int index = 0)
+        private static void ShowGuideByIndex(GObject target, bool needUpdate = false, string guideStr = null, int yTxt = 0, bool isOptionalGuide = false, float devWidth = 0, float devHeight = 0, int guideId = 0, int index = 0)
         {
         {
             HideGuideIndex();
             HideGuideIndex();
             if (GameGlobal.skipGuide)
             if (GameGlobal.skipGuide)

+ 37 - 20
GameClient/Assets/Game/HotUpdate/Data/GuideDataManager.cs

@@ -108,15 +108,7 @@ namespace GFGGame
 
 
             }
             }
         }
         }
-        public static bool IsGuideIndexFinish(int guideId, int index)
-        {
-            if (index == 0) return true;
-            if (_guideDicIndex.ContainsKey(guideId) && _guideDicIndex[guideId].ContainsKey(index) && _guideDicIndex[guideId][index] == 1)
-            {
-                return true;
-            }
-            return false;
-        }
+
 
 
         public static void SetGuideIndex(int guideId, int index)
         public static void SetGuideIndex(int guideId, int index)
         {
         {
@@ -127,6 +119,30 @@ namespace GFGGame
             if (_guideDicIndex[guideId].ContainsKey(index)) return;
             if (_guideDicIndex[guideId].ContainsKey(index)) return;
             _guideDicIndex[guideId][index] = 0;
             _guideDicIndex[guideId][index] = 0;
         }
         }
+
+        public static int GetGuideCountCopy(string guideKey)
+        {
+            if (!GuideController.useNewGuide) return 1;
+
+            GuideCfg cfg = GuideCfgArray.Instance.GetCfg(guideKey);
+            if (_dataDic.ContainsKey(cfg.id))
+            {
+                GuideData guideData = _dataDic[cfg.id];
+                return guideData.count;
+            }
+            return 0;
+        }
+        public static int GetGuideCountCopy(int guideId)
+        {
+            if (!GuideController.useNewGuide) return 1;
+
+            if (_dataDic.ContainsKey(guideId))
+            {
+                GuideData guideData = _dataDic[guideId];
+                return guideData.count;
+            }
+            return 0;
+        }
         public static bool TryCompleteGuideIndex(int guideId, int index, bool checkInde = true)
         public static bool TryCompleteGuideIndex(int guideId, int index, bool checkInde = true)
         {
         {
 
 
@@ -134,10 +150,7 @@ namespace GFGGame
             {
             {
                 return false;
                 return false;
             }
             }
-            if (currentGuideId > 0)
-            {
 
 
-            }
             if (!checkInde && guideId == currentGuideId || checkInde && guideId == currentGuideId && index == currentGuideIdIndex && !IsGuideIndexFinish(guideId, index))
             if (!checkInde && guideId == currentGuideId || checkInde && guideId == currentGuideId && index == currentGuideIdIndex && !IsGuideIndexFinish(guideId, index))
             {
             {
                 _guideDicIndex[guideId][index] = 1;
                 _guideDicIndex[guideId][index] = 1;
@@ -145,17 +158,12 @@ namespace GFGGame
             }
             }
             return false;
             return false;
         }
         }
-        public static int GetGuideCountCopy(string guideKey)
+        public static void SetGuideIndexState(int guideId, int index, int state)
         {
         {
-            if (!GuideController.useNewGuide) return 1;
-
-            GuideCfg cfg = GuideCfgArray.Instance.GetCfg(guideKey);
-            if (_dataDic.ContainsKey(cfg.id))
+            if (guideId == currentGuideId && index == currentGuideIdIndex && _guideDicIndex.ContainsKey(guideId) && _guideDicIndex[guideId].ContainsKey(index))
             {
             {
-                GuideData guideData = _dataDic[cfg.id];
-                return guideData.count;
+                _guideDicIndex[guideId][index] = state;
             }
             }
-            return 0;
         }
         }
         public static bool CheckAllIndexFinish(int guideId, int count)
         public static bool CheckAllIndexFinish(int guideId, int count)
         {
         {
@@ -165,5 +173,14 @@ namespace GFGGame
             }
             }
             return true;
             return true;
         }
         }
+        public static bool IsGuideIndexFinish(int guideId, int index)
+        {
+            if (index == 0) return true;
+            if (_guideDicIndex.ContainsKey(guideId) && _guideDicIndex[guideId].ContainsKey(index) && _guideDicIndex[guideId][index] == 1)
+            {
+                return true;
+            }
+            return false;
+        }
     }
     }
 }
 }

+ 2 - 3
GameClient/Assets/Game/HotUpdate/Views/Card/CardDetailView.cs

@@ -55,7 +55,7 @@ namespace GFGGame
             _ui.m_listRole.numItems = listRoleCount;
             _ui.m_listRole.numItems = listRoleCount;
             this.UpdateCardList(_ui.m_listRole.selectedIndex);
             this.UpdateCardList(_ui.m_listRole.selectedIndex);
             GuideController.TryGuideCardDetailViewList(_ui.m_listCard);
             GuideController.TryGuideCardDetailViewList(_ui.m_listCard);
-            Timers.inst.AddUpdate(UpdateToCheckGuide);
+
         }
         }
         private void UpdateCardList(int rarity = 0)
         private void UpdateCardList(int rarity = 0)
         {
         {
@@ -149,9 +149,8 @@ namespace GFGGame
         protected override void OnHide()
         protected override void OnHide()
         {
         {
             base.OnHide();
             base.OnHide();
-            Timers.inst.Remove(UpdateToCheckGuide);
         }
         }
-        private void UpdateToCheckGuide(object param)
+        protected override void UpdateToCheckGuide(object param)
         {
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
 
 

+ 1 - 3
GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs

@@ -105,7 +105,6 @@ namespace GFGGame
             _comFosterBottom.m_ctrlTab.selectedIndex = this._selectTab;
             _comFosterBottom.m_ctrlTab.selectedIndex = this._selectTab;
             EventAgent.AddEventListener(ConstMessage.MONEY_CHANGE, UpdateUpStarView);
             EventAgent.AddEventListener(ConstMessage.MONEY_CHANGE, UpdateUpStarView);
             GuideController.TryGuideCardFosterViewBtnStar(_ui.m_ComFosterBottom.m_btnStar);
             GuideController.TryGuideCardFosterViewBtnStar(_ui.m_ComFosterBottom.m_btnStar);
-            Timers.inst.AddUpdate(UpdateToCheckGuide);
         }
         }
 
 
         private void UpdateNormal()
         private void UpdateNormal()
@@ -679,9 +678,8 @@ namespace GFGGame
 
 
             //_timer.Stop();
             //_timer.Stop();
             _comFosterBottom.m_listLvConsume.numItems = 0;
             _comFosterBottom.m_listLvConsume.numItems = 0;
-            Timers.inst.Remove(UpdateToCheckGuide);
         }
         }
-        private void UpdateToCheckGuide(object param)
+        protected override void UpdateToCheckGuide(object param)
         {
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
             GuideController.TryGuide(_ui.m_ComFosterBottom.m_btnStar, ConstGuideId.UP_CARD_STAR, 4, "选择升星");
             GuideController.TryGuide(_ui.m_ComFosterBottom.m_btnStar, ConstGuideId.UP_CARD_STAR, 4, "选择升星");

+ 1 - 3
GameClient/Assets/Game/HotUpdate/Views/ClothingShop/ClothingShopView.cs

@@ -164,7 +164,6 @@ namespace GFGGame
                 BuyItemConteoller.Show(_cfgSelected.itemID, _cfgSelected.costID, INIT_COUNT, _cfgSelected.costNum, _selectedItemCount, null, true, false, MAX_COUNT);
                 BuyItemConteoller.Show(_cfgSelected.itemID, _cfgSelected.costID, INIT_COUNT, _cfgSelected.costNum, _selectedItemCount, null, true, false, MAX_COUNT);
             }
             }
             // GuideController.TryGuideClothingShopViewBtnBug(_ui.m_compItemInfo.m_btnBuy);
             // GuideController.TryGuideClothingShopViewBtnBug(_ui.m_compItemInfo.m_btnBuy);
-            Timers.inst.AddUpdate(UpdateToCheckGuide);
         }
         }
 
 
         protected override void OnHide()
         protected override void OnHide()
@@ -182,7 +181,6 @@ namespace GFGGame
             }
             }
             _selectedItemId = 0;
             _selectedItemId = 0;
             EventAgent.RemoveEventListener(ConstMessage.ITEM_CHANGED, UpdateSelectedItemInfo);
             EventAgent.RemoveEventListener(ConstMessage.ITEM_CHANGED, UpdateSelectedItemInfo);
-            Timers.inst.Remove(UpdateToCheckGuide);
         }
         }
 
 
         private void OnClickBtnBack()
         private void OnClickBtnBack()
@@ -356,7 +354,7 @@ namespace GFGGame
             item.m_loaTag.url = ResPathUtil.GetCommonGameResPath("fzd_bqbq_" + tag[0]);
             item.m_loaTag.url = ResPathUtil.GetCommonGameResPath("fzd_bqbq_" + tag[0]);
             item.m_txtTag.text = tag[1];
             item.m_txtTag.text = tag[1];
         }
         }
-        private void UpdateToCheckGuide(object param)
+        protected override void UpdateToCheckGuide(object param)
         {
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
 
 

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

@@ -112,13 +112,11 @@ namespace GFGGame
             EventAgent.AddEventListener(ConstMessage.ITEM_CHANGED, OnItemNumChanged);
             EventAgent.AddEventListener(ConstMessage.ITEM_CHANGED, OnItemNumChanged);
 
 
             GuideController.TryGuideClothingSyntheticViewSuitList(_ui.m_listClothing);
             GuideController.TryGuideClothingSyntheticViewSuitList(_ui.m_listClothing);
-            Timers.inst.AddUpdate(UpdateToCheckGuide);
         }
         }
 
 
         protected override void OnHide()
         protected override void OnHide()
         {
         {
             base.OnHide();
             base.OnHide();
-            Timers.inst.Remove(UpdateToCheckGuide);
             _valueBarController.OnHide();
             _valueBarController.OnHide();
             if (_sceneObject != null)
             if (_sceneObject != null)
             {
             {
@@ -391,7 +389,7 @@ namespace GFGGame
                 GuideController.TryGuideClothingSyntheticViewBtnHome(_ui.m_btnHome);
                 GuideController.TryGuideClothingSyntheticViewBtnHome(_ui.m_btnHome);
             }
             }
         }
         }
-        private void UpdateToCheckGuide(object param)
+        protected override void UpdateToCheckGuide(object param)
         {
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
 
 

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

@@ -40,13 +40,11 @@ namespace GFGGame
 
 
             EventAgent.AddEventListener(ConstMessage.SUIT_BOX_STATUS_CHANGED, UpdateSuitBoxStatus);
             EventAgent.AddEventListener(ConstMessage.SUIT_BOX_STATUS_CHANGED, UpdateSuitBoxStatus);
             GuideController.TryGuideSuitSyntheticViewList(_ui.m_listSuit);
             GuideController.TryGuideSuitSyntheticViewList(_ui.m_listSuit);
-            Timers.inst.AddUpdate(UpdateToCheckGuide);
         }
         }
 
 
         protected override void OnHide()
         protected override void OnHide()
         {
         {
             base.OnHide();
             base.OnHide();
-            Timers.inst.Remove(UpdateToCheckGuide);
             EventAgent.RemoveEventListener(ConstMessage.SUIT_BOX_STATUS_CHANGED, UpdateSuitBoxStatus);
             EventAgent.RemoveEventListener(ConstMessage.SUIT_BOX_STATUS_CHANGED, UpdateSuitBoxStatus);
         }
         }
 
 
@@ -180,7 +178,7 @@ namespace GFGGame
                 }
                 }
             }
             }
         }
         }
-        private void UpdateToCheckGuide(object param)
+        protected override void UpdateToCheckGuide(object param)
         {
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
 
 

+ 1 - 4
GameClient/Assets/Game/HotUpdate/Views/CommonGame/ApproachOfItemView.cs

@@ -61,7 +61,6 @@ namespace GFGGame
             }
             }
 
 
             GuideController.TryGuideApproachOfItemViewList(_ui.m_listApproach);
             GuideController.TryGuideApproachOfItemViewList(_ui.m_listApproach);
-            Timers.inst.AddUpdate(UpdateToCheckGuide);
 
 
         }
         }
 
 
@@ -69,8 +68,6 @@ namespace GFGGame
         {
         {
             base.OnHide();
             base.OnHide();
             _fromeViewDatas = null;
             _fromeViewDatas = null;
-            Timers.inst.Remove(UpdateToCheckGuide);
-
         }
         }
 
 
         private void ListApproachItemRenderer(int index, GObject item)
         private void ListApproachItemRenderer(int index, GObject item)
@@ -152,7 +149,7 @@ namespace GFGGame
                     break;
                     break;
             }
             }
         }
         }
-        private void UpdateToCheckGuide(object param)
+        protected override void UpdateToCheckGuide(object param)
         {
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
 
 

+ 1 - 3
GameClient/Assets/Game/HotUpdate/Views/CommonGame/BuyCountView.cs

@@ -78,7 +78,6 @@ namespace GFGGame
             _ui.m_txtCount.text = "" + _count;
             _ui.m_txtCount.text = "" + _count;
             UpdateView();
             UpdateView();
             GuideController.TryGuideBuyCountViewBtnSure(_ui.m_btnSure);
             GuideController.TryGuideBuyCountViewBtnSure(_ui.m_btnSure);
-            Timers.inst.AddUpdate(UpdateToCheckGuide);
 
 
         }
         }
         private void UpdateView()
         private void UpdateView()
@@ -288,10 +287,9 @@ namespace GFGGame
             base.OnHide();
             base.OnHide();
             // _cfg = null;
             // _cfg = null;
             Reset();
             Reset();
-            Timers.inst.Remove(UpdateToCheckGuide);
 
 
         }
         }
-        private void UpdateToCheckGuide(object param)
+        protected override void UpdateToCheckGuide(object param)
         {
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
 
 

+ 1 - 3
GameClient/Assets/Game/HotUpdate/Views/CommonGame/GetBonusView.cs

@@ -43,7 +43,6 @@ namespace GFGGame
             }
             }
             int targetY = (int)(this.viewCom.y + _ui.target.y + _ui.target.height);
             int targetY = (int)(this.viewCom.y + _ui.target.y + _ui.target.height);
             GuideController.TryGuideByGuideId(null, ConstGuideId.GET_BONUS_VIEW, 1, false, "恭喜你,获得了第一份奖励,点击图标可以查看物品信息,点击半透明区域继续", targetY);
             GuideController.TryGuideByGuideId(null, ConstGuideId.GET_BONUS_VIEW, 1, false, "恭喜你,获得了第一份奖励,点击图标可以查看物品信息,点击半透明区域继续", targetY);
-            Timers.inst.AddUpdate(UpdateToCheckGuide);
         }
         }
 
 
         protected override void OnHide()
         protected override void OnHide()
@@ -53,7 +52,6 @@ namespace GFGGame
             GuideController.TryCompleteGuide(ConstGuideId.GET_BONUS_VIEW);
             GuideController.TryCompleteGuide(ConstGuideId.GET_BONUS_VIEW);
             TryCompleteGuide();
             TryCompleteGuide();
             GetSuitItemController.TryShow(0);
             GetSuitItemController.TryShow(0);
-            Timers.inst.Remove(UpdateToCheckGuide);
         }
         }
 
 
         private void OnClickListBonusItem(EventContext context)
         private void OnClickListBonusItem(EventContext context)
@@ -77,7 +75,7 @@ namespace GFGGame
             listItem.target.data = itemData.id;
             listItem.target.data = itemData.id;
         }
         }
 
 
-        private void UpdateToCheckGuide(object param)
+        protected override void UpdateToCheckGuide(object param)
         {
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
             GuideController.TryGuide(null, ConstGuideId.GET_BONUS_FIRST, 1, "恭喜你,获得了第一份奖励,点击图标可以查看物品信息,点击半透明区域继续", false, 0, true, false, (int)(this.viewCom.y + _ui.target.y + _ui.target.height));
             GuideController.TryGuide(null, ConstGuideId.GET_BONUS_FIRST, 1, "恭喜你,获得了第一份奖励,点击图标可以查看物品信息,点击半透明区域继续", false, 0, true, false, (int)(this.viewCom.y + _ui.target.y + _ui.target.height));

+ 1 - 3
GameClient/Assets/Game/HotUpdate/Views/CommonGame/GetSuitItemVIew.cs

@@ -41,7 +41,6 @@ namespace GFGGame
             int itemId = (int)viewData;
             int itemId = (int)viewData;
             guideId = 0;
             guideId = 0;
             UpdateView(itemId);
             UpdateView(itemId);
-            Timers.inst.AddUpdate(UpdateToCheckGuide);
         }
         }
 
 
         protected override void OnHide()
         protected override void OnHide()
@@ -67,7 +66,6 @@ namespace GFGGame
             GuideController.HideGuide();
             GuideController.HideGuide();
             GuideController.TryCompleteGuide(ConstGuideId.GET_SUIT_ITEM_VIEW_FIRST);
             GuideController.TryCompleteGuide(ConstGuideId.GET_SUIT_ITEM_VIEW_FIRST);
             GuideController.TryCompleteGuide(ConstGuideId.GET_SUIT_ITEM_VIEW_FULL);
             GuideController.TryCompleteGuide(ConstGuideId.GET_SUIT_ITEM_VIEW_FULL);
-            Timers.inst.Remove(UpdateToCheckGuide);
             TryCompleteGuide();
             TryCompleteGuide();
         }
         }
 
 
@@ -155,7 +153,7 @@ namespace GFGGame
             }
             }
         }
         }
 
 
-        private void UpdateToCheckGuide(object param)
+        protected override void UpdateToCheckGuide(object param)
         {
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
             if (guideId == 1) GuideController.TryGuide(null, ConstGuideId.GET_SUIT_ITEM_FULL, 1, "恭喜你,集齐了第一套套装,快去换装界面穿上试试吧!点击空白区域继续", false, 0, true, false, (int)(this.viewCom.height - 150));
             if (guideId == 1) GuideController.TryGuide(null, ConstGuideId.GET_SUIT_ITEM_FULL, 1, "恭喜你,集齐了第一套套装,快去换装界面穿上试试吧!点击空白区域继续", false, 0, true, false, (int)(this.viewCom.height - 150));

+ 3 - 31
GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpFightView.cs

@@ -55,6 +55,7 @@ namespace GFGGame
             _ui.m_btnClose.width = GRoot.inst.width;
             _ui.m_btnClose.width = GRoot.inst.width;
             _ui.m_btnClose.height = GRoot.inst.height;
             _ui.m_btnClose.height = GRoot.inst.height;
             _ui.m_btnClose.AddRelation(GRoot.inst, RelationType.Size);
             _ui.m_btnClose.AddRelation(GRoot.inst, RelationType.Size);
+
         }
         }
 
 
         protected override void OnInit()
         protected override void OnInit()
@@ -160,28 +161,12 @@ namespace GFGGame
             UpdateScore();
             UpdateScore();
             EventAgent.AddEventListener(ConstMessage.DRESS_UP_SCORE_CHANGED, UpdateScore);
             EventAgent.AddEventListener(ConstMessage.DRESS_UP_SCORE_CHANGED, UpdateScore);
 
 
-            if (GuideDataManager.GetGuideCount(ConstGuideId.SINGLE_FIGHT_GUIDE) <= 0)
-            {
-                _guideMenu = GuideController.TryGuideDressUpFightViewMenuType0(_ui.m_comListType1.m_listType);
-            }
-            else if (GuideDataManager.GetGuideCount(ConstGuideId.CLOTHING_SHOP_VIEW_BTN_BUY) <= 0)
-            {
-                GuideController.TryGuideDressUpFightViewBtnRecommend(_ui.m_compNeed.target, _ui.m_comListType1.m_listType);
-            }
-            else if (GuideDataManager.GetGuideCount(ConstGuideId.SEE_DRESS_TIPS) <= 0)
-            {
-                GuideController.TryGuideDressUpFightViewBtnHint(_ui.m_btnHint);
-            }
-            Timers.inst.AddUpdate(UpdateToCheckGuide);
 
 
         }
         }
 
 
         protected override void OnHide()
         protected override void OnHide()
         {
         {
             base.OnHide();
             base.OnHide();
-            Timers.inst.Remove(UpdateToCheckGuide);
-
-            GuideController.HideGuide();
             if (_sceneObject != null)
             if (_sceneObject != null)
             {
             {
                 GameObject.Destroy(_sceneObject);
                 GameObject.Destroy(_sceneObject);
@@ -227,14 +212,6 @@ namespace GFGGame
             {
             {
                 this.showListParts(item1.type);
                 this.showListParts(item1.type);
 
 
-                if (GuideDataManager.GetGuideCount(ConstGuideId.SINGLE_FIGHT_GUIDE) <= 0)
-                {
-                    GuideController.TryGuideDressUpFightViewMenuPart0(_ui.m_partsList.m_list, "找到这条裙子了,换上看看吧");
-                }
-                else if (GuideDataManager.GetGuideCount(ConstGuideId.CLOTHING_SHOP_VIEW_BTN_BUY) <= 0)
-                {
-                    GuideController.TryGuideDressUpFightViewMenuPart1(_ui.m_partsList.m_list, "点击换上吧");
-                }
             }
             }
             this.hideListType1();
             this.hideListType1();
         }
         }
@@ -264,10 +241,7 @@ namespace GFGGame
                 EquipDataCache.cacher.AddOrRemove(id, true);
                 EquipDataCache.cacher.AddOrRemove(id, true);
                 UpdateListPartsSelected();
                 UpdateListPartsSelected();
 
 
-                GuideController.TryGuideDressUpFightViewBtnNext0(_ui.m_btnNext);
-
             }
             }
-            GuideController.TryCompleteGuide(ConstGuideId.CLOTHING_SHOP_VIEW_BTN_BUY);
 
 
         }
         }
 
 
@@ -295,8 +269,7 @@ namespace GFGGame
         private void OnClickBtnHint()
         private void OnClickBtnHint()
         {
         {
             this.ShowTaskHint();
             this.ShowTaskHint();
-            GuideController.HideGuide();
-            GuideController.TryCompleteGuide(ConstGuideId.SEE_DRESS_TIPS);
+
         }
         }
 
 
         private void OnClickBtnDelete()
         private void OnClickBtnDelete()
@@ -651,7 +624,6 @@ namespace GFGGame
         }
         }
         private void OnClickComNeed()
         private void OnClickComNeed()
         {
         {
-            GuideController.HideGuide();
             if (_fightCfg.needItemId <= 0 && _fightCfg.needSuitId <= 0)
             if (_fightCfg.needItemId <= 0 && _fightCfg.needSuitId <= 0)
             {
             {
                 return;
                 return;
@@ -676,7 +648,7 @@ namespace GFGGame
             item.m_txtTag.text = tag[1];
             item.m_txtTag.text = tag[1];
         }
         }
 
 
-        private void UpdateToCheckGuide(object param)
+        protected override void UpdateToCheckGuide(object param)
         {
         {
 
 
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;

+ 1 - 3
GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpView.cs

@@ -99,14 +99,12 @@ namespace GFGGame
             EquipDataCache.cacher.PutOnCurrentSuitSaved();
             EquipDataCache.cacher.PutOnCurrentSuitSaved();
             GuideController.TryGuideDressUpViewMenuType1(_ui.m_comListType1.m_listType);
             GuideController.TryGuideDressUpViewMenuType1(_ui.m_comListType1.m_listType);
             GuideController.TryGuideDressUpViewMenuType2(_ui.m_btnPhoto);
             GuideController.TryGuideDressUpViewMenuType2(_ui.m_btnPhoto);
-            Timers.inst.AddUpdate(UpdateToCheckGuide);
         }
         }
 
 
         protected override void OnHide()
         protected override void OnHide()
         {
         {
             base.OnHide();
             base.OnHide();
             listTypeItem_FreedomDress = null;
             listTypeItem_FreedomDress = null;
-            Timers.inst.Remove(UpdateToCheckGuide);
             GuideController.HideGuide();
             GuideController.HideGuide();
             MusicManager.Instance.Play(ResPathUtil.GetMusicPath(ConstMusicName.DEFAULT));
             MusicManager.Instance.Play(ResPathUtil.GetMusicPath(ConstMusicName.DEFAULT));
             if (_sceneObject != null)
             if (_sceneObject != null)
@@ -554,7 +552,7 @@ namespace GFGGame
             GTween.To(1, 0, 0.3f).SetTarget(_ui.m_btnShow, TweenPropType.Alpha);
             GTween.To(1, 0, 0.3f).SetTarget(_ui.m_btnShow, TweenPropType.Alpha);
         }
         }
 
 
-        private void UpdateToCheckGuide(object param)
+        protected override void UpdateToCheckGuide(object param)
         {
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
             if (listTypeItem_FreedomDress == null && GuideDataManager.GetGuideCountCopy(ConstGuideId.FREEDOM_DRESS) <= 0)
             if (listTypeItem_FreedomDress == null && GuideDataManager.GetGuideCountCopy(ConstGuideId.FREEDOM_DRESS) <= 0)

+ 1 - 3
GameClient/Assets/Game/HotUpdate/Views/DressUp/PhotographView.cs

@@ -136,7 +136,6 @@ namespace GFGGame
                 _ui.m_loaGuide1.enabled = false;
                 _ui.m_loaGuide1.enabled = false;
             }
             }
             // CreatTex();
             // CreatTex();
-            Timers.inst.AddUpdate(UpdateToCheckGuide);
         }
         }
         /************************************************************UI界面*********************************************************/
         /************************************************************UI界面*********************************************************/
         private void OnContorllerChanged(EventContext context)
         private void OnContorllerChanged(EventContext context)
@@ -620,7 +619,6 @@ namespace GFGGame
             pinchGesture = null;
             pinchGesture = null;
             rotationGesture = null;
             rotationGesture = null;
 
 
-            Timers.inst.Remove(UpdateToCheckGuide);
         }
         }
         public override void Dispose()
         public override void Dispose()
         {
         {
@@ -631,7 +629,7 @@ namespace GFGGame
             }
             }
             base.Dispose();
             base.Dispose();
         }
         }
-        private void UpdateToCheckGuide(object param)
+        protected override void UpdateToCheckGuide(object param)
         {
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
             GuideController.TryGuide(_ui.m_ComSelectRes.m_comBtnTab.m_btn2, ConstGuideId.PHOTOGRAPH, 4, "可以自由添加已有道具");
             GuideController.TryGuide(_ui.m_ComSelectRes.m_comBtnTab.m_btn2, ConstGuideId.PHOTOGRAPH, 4, "可以自由添加已有道具");

+ 5 - 16
GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxStarView.cs

@@ -32,7 +32,7 @@ namespace GFGGame
         private const int checkDistance = 40;//鼠标靠近星星周围加减40都算选中星星
         private const int checkDistance = 40;//鼠标靠近星星周围加减40都算选中星星
         private const int imgLineWidth = 10;//线的原始长度
         private const int imgLineWidth = 10;//线的原始长度
 
 
-        private bool isGuide = false;
+        private bool showGuide = false;
         private bool isFirst = true;
         private bool isFirst = true;
         public override void Dispose()
         public override void Dispose()
         {
         {
@@ -61,7 +61,6 @@ namespace GFGGame
             this.viewCom = _ui.target;
             this.viewCom = _ui.target;
             isfullScreen = true;
             isfullScreen = true;
 
 
-
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
         }
         }
         protected override void OnShown()
         protected override void OnShown()
@@ -77,11 +76,10 @@ namespace GFGGame
             _ui.m_ctrlRewardsType.selectedIndex = Array.IndexOf(LuckyBoxCfgArray.Instance.dataArray, LuckyBoxCfgArray.Instance.GetCfg((int)viewData)); ;
             _ui.m_ctrlRewardsType.selectedIndex = Array.IndexOf(LuckyBoxCfgArray.Instance.dataArray, LuckyBoxCfgArray.Instance.GetCfg((int)viewData)); ;
             isFirst = true;
             isFirst = true;
             ResetStartView();
             ResetStartView();
-            Timers.inst.AddUpdate(UpdateToCheckGuide);
         }
         }
         private void ResetStartView()
         private void ResetStartView()
         {
         {
-            isGuide = GuideController.TryGuideLuckyBoxStar() || GuideDataManager.GetGuideCountCopy(ConstGuideId.LUCKY_BOX) <= 0;
+            showGuide = GuideController.TryGuideLuckyBoxStar() || GuideDataManager.GetGuideCountCopy(ConstGuideId.LUCKY_BOX) <= 0;
 
 
             curComStar = null;
             curComStar = null;
             comStars.Clear();
             comStars.Clear();
@@ -194,7 +192,7 @@ namespace GFGGame
 
 
         private void OnClickUIEnd()
         private void OnClickUIEnd()
         {
         {
-            if (isGuide && comStars.Count > 0)
+            if (showGuide && comStars.Count > 0)
             {
             {
                 isFirst = false;
                 isFirst = false;
                 ResetStartView();
                 ResetStartView();
@@ -241,18 +239,8 @@ namespace GFGGame
         protected override void OnHide()
         protected override void OnHide()
         {
         {
             base.OnHide();
             base.OnHide();
-            // _gameObjects.Clear();
-            // _wrappers.Clear();
-            // _gameObjects1.Clear();
-            // _wrappers1.Clear();
-            // for (int i = 0; i < _gameObjects.Count; i++)
-            // {
-            //     SceneController.DestroyObjectFromView(_gameObjects[i]);
-            //     SceneController.DestroyObjectFromView(_gameObjects1[i]);
-            // }
-            Timers.inst.Remove(UpdateToCheckGuide);
         }
         }
-        private void UpdateToCheckGuide(object param)
+        protected override void UpdateToCheckGuide(object param)
         {
         {
 
 
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
@@ -270,6 +258,7 @@ namespace GFGGame
             }
             }
             else
             else
             {
             {
+                GuideDataManager.SetGuideIndexState(GuideDataManager.currentGuideId, GuideDataManager.currentGuideIdIndex, 0);
                 GuideDataManager.currentGuideIdIndex = 3;
                 GuideDataManager.currentGuideIdIndex = 3;
             }
             }
         }
         }

+ 1 - 6
GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxView.cs

@@ -140,7 +140,6 @@ namespace GFGGame
             _ui.m_comCostOne.m_loaCost.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(luckyBoxCfg.costID).res);
             _ui.m_comCostOne.m_loaCost.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(luckyBoxCfg.costID).res);
             _ui.m_comCostTen.m_loaCost.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(luckyBoxCfg.costID).res);
             _ui.m_comCostTen.m_loaCost.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(luckyBoxCfg.costID).res);
 
 
-            Timers.inst.AddUpdate(UpdateToCheckGuide);
 
 
             int count = LuckyBoxBonusDataCache.GetOwnedCount();
             int count = LuckyBoxBonusDataCache.GetOwnedCount();
             _ui.m_txtOwned.SetVar("v1", "" + count).FlushVars();
             _ui.m_txtOwned.SetVar("v1", "" + count).FlushVars();
@@ -203,7 +202,6 @@ namespace GFGGame
             if (GuideDataManager.GetGuideCount(ConstGuideId.MAIN_UI_BTN_ZHAI_XING) <= 0 || GuideDataManager.GetGuideCountCopy(ConstGuideId.LUCKY_BOX) <= 0)
             if (GuideDataManager.GetGuideCount(ConstGuideId.MAIN_UI_BTN_ZHAI_XING) <= 0 || GuideDataManager.GetGuideCountCopy(ConstGuideId.LUCKY_BOX) <= 0)
             {
             {
 
 
-                Timers.inst.AddUpdate(UpdateToCheckGuide);
                 int count = ItemDataManager.GetItemNum(luckyBoxCfg.costID);
                 int count = ItemDataManager.GetItemNum(luckyBoxCfg.costID);
                 if (count < luckyBoxCfg.costNumTen)
                 if (count < luckyBoxCfg.costNumTen)
                 {
                 {
@@ -234,7 +232,6 @@ namespace GFGGame
             base.OnHide();
             base.OnHide();
             _valueBarController.OnHide();
             _valueBarController.OnHide();
 
 
-            Timers.inst.Remove(UpdateToCheckGuide);
             Timers.inst.Remove(CheckTime);
             Timers.inst.Remove(CheckTime);
             EventAgent.RemoveEventListener(ConstMessage.ITEM_CHANGED, UpdateNormal);
             EventAgent.RemoveEventListener(ConstMessage.ITEM_CHANGED, UpdateNormal);
             EventAgent.RemoveEventListener(ConstMessage.MONEY_CHANGE, UpdateNormal);
             EventAgent.RemoveEventListener(ConstMessage.MONEY_CHANGE, UpdateNormal);
@@ -258,7 +255,7 @@ namespace GFGGame
         {
         {
             LuckyBoxBonusDataCache.currentBoxId = LuckyBoxDataManager.BOX_ID_1;
             LuckyBoxBonusDataCache.currentBoxId = LuckyBoxDataManager.BOX_ID_1;
         }
         }
-        private void UpdateToCheckGuide(object param)
+        protected override void UpdateToCheckGuide(object param)
         {
         {
             if (this.viewCom.parent != null)
             if (this.viewCom.parent != null)
             {
             {
@@ -266,13 +263,11 @@ namespace GFGGame
                 {
                 {
                     if (GuideController.TryGuideByGuideId(_ui.m_btnBuyTen.target, ConstGuideId.MAIN_UI_BTN_ZHAI_XING, 1, true, "点击摘取十次"))
                     if (GuideController.TryGuideByGuideId(_ui.m_btnBuyTen.target, ConstGuideId.MAIN_UI_BTN_ZHAI_XING, 1, true, "点击摘取十次"))
                     {
                     {
-                        Timers.inst.Remove(UpdateToCheckGuide);
                     }
                     }
                     else
                     else
                     {
                     {
                         if (GuideController.TryGuideByGuideId(_ui.m_btnBack, ConstGuideId.LUCKY_BOX_VIEW_BTN_BACK, 1, true, "获得一套完整的服装啦,马上去试穿一下", 0, ConstGuideId.MAIN_UI_BTN_ZHAI_XING))
                         if (GuideController.TryGuideByGuideId(_ui.m_btnBack, ConstGuideId.LUCKY_BOX_VIEW_BTN_BACK, 1, true, "获得一套完整的服装啦,马上去试穿一下", 0, ConstGuideId.MAIN_UI_BTN_ZHAI_XING))
                         {
                         {
-                            Timers.inst.Remove(UpdateToCheckGuide);
                         }
                         }
                     }
                     }
                 }
                 }

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

@@ -46,7 +46,6 @@ namespace GFGGame
             UpdateView(0);
             UpdateView(0);
 
 
             GuideController.TryGuideStoryCardChoose(_ui.m_listCard);
             GuideController.TryGuideStoryCardChoose(_ui.m_listCard);
-            Timers.inst.AddUpdate(UpdateToCheckGuide);
         }
         }
 
 
         private void UpdateView(int index)
         private void UpdateView(int index)
@@ -116,9 +115,8 @@ namespace GFGGame
         protected override void OnHide()
         protected override void OnHide()
         {
         {
             base.OnHide();
             base.OnHide();
-            Timers.inst.Remove(UpdateToCheckGuide);
         }
         }
-        private void UpdateToCheckGuide(object param)
+        protected override void UpdateToCheckGuide(object param)
         {
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
 
 

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

@@ -36,6 +36,7 @@ namespace GFGGame
             _ui = UI_StoryChapterUI.Create();
             _ui = UI_StoryChapterUI.Create();
             viewCom = _ui.target;
             viewCom = _ui.target;
             isfullScreen = true;
             isfullScreen = true;
+
         }
         }
 
 
         protected override void OnInit()
         protected override void OnInit()
@@ -73,9 +74,7 @@ namespace GFGGame
             || GuideDataManager.GetGuideCount(ConstGuideId.SUIT_SYNTHETIC_GUIDE) <= 0
             || GuideDataManager.GetGuideCount(ConstGuideId.SUIT_SYNTHETIC_GUIDE) <= 0
             || GuideDataManager.GetGuideCount(ConstGuideId.CARD_UP_STAR) <= 0)
             || GuideDataManager.GetGuideCount(ConstGuideId.CARD_UP_STAR) <= 0)
             {
             {
-                Timers.inst.AddUpdate(UpdateToCheckGuide);
             }
             }
-            Timers.inst.AddUpdate(UpdateToCheckGuide);
         }
         }
 
 
         protected override void OnHide()
         protected override void OnHide()
@@ -86,7 +85,6 @@ namespace GFGGame
             GuideController.HideGuide();
             GuideController.HideGuide();
             _ui.m_chapter.RemoveChildren(0, 0, true);
             _ui.m_chapter.RemoveChildren(0, 0, true);
             _valueBarController.OnHide();
             _valueBarController.OnHide();
-            Timers.inst.Remove(UpdateToCheckGuide);
         }
         }
 
 
         private void OnClickBtnBack()
         private void OnClickBtnBack()
@@ -248,7 +246,7 @@ namespace GFGGame
             }
             }
         }
         }
 
 
-        private void UpdateToCheckGuide(object param)
+        protected override void UpdateToCheckGuide(object param)
         {
         {
             // if (this.viewCom.parent != null)
             // if (this.viewCom.parent != null)
             // {
             // {

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

@@ -62,8 +62,6 @@ namespace GFGGame
             {
             {
                 SkillScoreStart(null);
                 SkillScoreStart(null);
             });//评分结束
             });//评分结束
-            Timers.inst.AddUpdate(UpdateToCheckGuide);
-
         }
         }
 
 
         private void SkillScoreStart(object param)
         private void SkillScoreStart(object param)
@@ -269,7 +267,6 @@ namespace GFGGame
                 GameObject.Destroy(_sceneObject);
                 GameObject.Destroy(_sceneObject);
                 _sceneObject = null;
                 _sceneObject = null;
             }
             }
-            Timers.inst.Remove(UpdateToCheckGuide);
 
 
         }
         }
 
 
@@ -306,7 +303,7 @@ namespace GFGGame
             return clickState;
             return clickState;
         }
         }
 
 
-        private void UpdateToCheckGuide(object param)
+        protected override void UpdateToCheckGuide(object param)
         {
         {
             // if (this.viewCom.parent != null)
             // if (this.viewCom.parent != null)
             // {
             // {

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

@@ -135,7 +135,6 @@ namespace GFGGame
                 _ui.m_btnSkill0.target.touchable = false;
                 _ui.m_btnSkill0.target.touchable = false;
             }
             }
             Timers.inst.Add(0.5f, 1, CircleScoreStart);//评分开始
             Timers.inst.Add(0.5f, 1, CircleScoreStart);//评分开始
-            Timers.inst.AddUpdate(UpdateToCheckGuide);
         }
         }
         private void UpdateNormal()
         private void UpdateNormal()
         {
         {
@@ -451,7 +450,6 @@ namespace GFGGame
             }
             }
             _npcSkillDic.Clear();
             _npcSkillDic.Clear();
 
 
-            Timers.inst.Remove(UpdateToCheckGuide);
         }
         }
 
 
         private void Skip(object param = null)
         private void Skip(object param = null)
@@ -502,7 +500,7 @@ namespace GFGGame
             Timers.inst.Remove(Skip);
             Timers.inst.Remove(Skip);
         }
         }
 
 
-        private void UpdateToCheckGuide(object param)
+        protected override void UpdateToCheckGuide(object param)
         {
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
 
 

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

@@ -54,7 +54,6 @@ namespace GFGGame
             GuideController.TryGuideStoryLevelInfoListTag(_ui.m_listTag);
             GuideController.TryGuideStoryLevelInfoListTag(_ui.m_listTag);
 
 
             EventAgent.AddEventListener(ConstMessage.ROLE_POWER_CHANGED, UpdateBtnFightTimes);
             EventAgent.AddEventListener(ConstMessage.ROLE_POWER_CHANGED, UpdateBtnFightTimes);
-            Timers.inst.AddUpdate(UpdateToCheckGuide);
         }
         }
 
 
         protected override void OnHide()
         protected override void OnHide()
@@ -63,7 +62,6 @@ namespace GFGGame
 
 
             EventAgent.RemoveEventListener(ConstMessage.ROLE_POWER_CHANGED, UpdateBtnFightTimes);
             EventAgent.RemoveEventListener(ConstMessage.ROLE_POWER_CHANGED, UpdateBtnFightTimes);
             TryCompleteGuide();
             TryCompleteGuide();
-            Timers.inst.Remove(UpdateToCheckGuide);
 
 
             if (GuideDataManager.currentGuideId == ConstGuideId.SUIT_SYNTHETIC_GUIDE)
             if (GuideDataManager.currentGuideId == ConstGuideId.SUIT_SYNTHETIC_GUIDE)
             {
             {
@@ -252,7 +250,7 @@ namespace GFGGame
             item.m_txtTag.text = tag[1];
             item.m_txtTag.text = tag[1];
         }
         }
 
 
-        private void UpdateToCheckGuide(object param)
+        protected override void UpdateToCheckGuide(object param)
         {
         {
             // if (GRoot.inst.GetTopWindow() == this.viewCom)
             // if (GRoot.inst.GetTopWindow() == this.viewCom)
             // {
             // {

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

@@ -185,7 +185,7 @@ namespace GFGGame
             }
             }
             GuideController.TryGuideByGuideId(null, ConstGuideId.FIGHT_RESULT_TIPS_GUIDE, 2, false, txt, targetY);
             GuideController.TryGuideByGuideId(null, ConstGuideId.FIGHT_RESULT_TIPS_GUIDE, 2, false, txt, targetY);
         }
         }
-        private void UpdateToCheckGuide(object param)
+        protected override void UpdateToCheckGuide(object param)
         {
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
             if (!resule) GuideController.TryGuide(null, ConstGuideId.FIRST_FIGHT_FAILED, 1, "不要气馁呀,可以通过再次挑战已通关的关卡、摘星、绣坊等途径获取更多的物资来提升自己的战斗力哦!", false, 0, true, false, (int)(this.viewCom.height - 150));
             if (!resule) GuideController.TryGuide(null, ConstGuideId.FIRST_FIGHT_FAILED, 1, "不要气馁呀,可以通过再次挑战已通关的关卡、摘星、绣坊等途径获取更多的物资来提升自己的战斗力哦!", false, 0, true, false, (int)(this.viewCom.height - 150));

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

@@ -76,11 +76,13 @@ namespace GFGGame
             viewCom = _ui.target;
             viewCom = _ui.target;
             isfullScreen = true;
             isfullScreen = true;
             _scenePrefab = GFGAsset.Load<GameObject>(ResPathUtil.GetPrefabPath("SceneMain"));
             _scenePrefab = GFGAsset.Load<GameObject>(ResPathUtil.GetPrefabPath("SceneMain"));
+
         }
         }
 
 
         protected override void OnInit()
         protected override void OnInit()
         {
         {
             base.OnInit();
             base.OnInit();
+
             _valueBarController = new ValueBarController(_ui.m_valueBar);
             _valueBarController = new ValueBarController(_ui.m_valueBar);
 
 
             _btnGongGao = _ui.m_list.GetChild("btnGongGao").asButton;
             _btnGongGao = _ui.m_list.GetChild("btnGongGao").asButton;
@@ -129,9 +131,8 @@ namespace GFGGame
             _valueBarController.OnShown();
             _valueBarController.OnShown();
             AddEffect();
             AddEffect();
 
 
-            UpdateToCheckGuide();
+            // UpdateToCheckGuide();
             Timers.inst.AddUpdate(Update);
             Timers.inst.AddUpdate(Update);
-            Timers.inst.AddUpdate(UpdateToCheckNewGuide);
         }
         }
 
 
         protected override void OnHide()
         protected override void OnHide()
@@ -145,7 +146,6 @@ namespace GFGGame
             }
             }
             _valueBarController.OnHide();
             _valueBarController.OnHide();
             Timers.inst.Remove(Update);
             Timers.inst.Remove(Update);
-            Timers.inst.Remove(UpdateToCheckNewGuide);
         }
         }
         private void AddEffect()
         private void AddEffect()
         {
         {
@@ -211,7 +211,6 @@ namespace GFGGame
             Timers.inst.Add(effectTime, 1, (param) =>
             Timers.inst.Add(effectTime, 1, (param) =>
             {
             {
                 _ui.m_btnZhaiXing.m_holder1.visible = false;
                 _ui.m_btnZhaiXing.m_holder1.visible = false;
-                Timers.inst.AddUpdate(UpdateToCheckGuide);
                 ViewManager.Show(ViewName.LUCKY_BOX_VIEW, null, null, false, true);
                 ViewManager.Show(ViewName.LUCKY_BOX_VIEW, null, null, false, true);
                 isOpen = false;
                 isOpen = false;
 
 
@@ -227,7 +226,6 @@ namespace GFGGame
             Timers.inst.Add(effectTime, 1, (param) =>
             Timers.inst.Add(effectTime, 1, (param) =>
             {
             {
                 _ui.m_btnXiuFang.m_holder1.visible = false;
                 _ui.m_btnXiuFang.m_holder1.visible = false;
-                Timers.inst.AddUpdate(UpdateToCheckGuide);
                 ViewManager.Show(ViewName.XIU_FANG_VIEW, null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
                 ViewManager.Show(ViewName.XIU_FANG_VIEW, null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
                 isOpen = false;
                 isOpen = false;
 
 
@@ -257,13 +255,11 @@ namespace GFGGame
 
 
         private void OnClickBtnStore()
         private void OnClickBtnStore()
         {
         {
-            Timers.inst.AddUpdate(UpdateToCheckGuide);
             ViewManager.Show(ViewName.RECHARGE_STORE_VIEW);
             ViewManager.Show(ViewName.RECHARGE_STORE_VIEW);
         }
         }
 
 
         private void OnClickBtnTuJian()
         private void OnClickBtnTuJian()
         {
         {
-            Timers.inst.AddUpdate(UpdateToCheckGuide);
             ViewManager.Show(ViewName.FIELD_GUIDE_VIEW, null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
             ViewManager.Show(ViewName.FIELD_GUIDE_VIEW, null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
         }
         }
         private void OnClickBtnYouJian()
         private void OnClickBtnYouJian()
@@ -293,49 +289,49 @@ namespace GFGGame
             }
             }
         }
         }
 
 
-        private void UpdateToCheckGuide(object param)
-        {
-            if (this.viewCom != null && this.viewCom.parent != null)
-            {
-                int index = this.viewCom.parent.GetChildIndex(this.viewCom);
-                if (index == this.viewCom.parent.numChildren - 1 && GRoot.inst.GetTopWindow() == null)
-                {
-                    UpdateToCheckGuide();
-                    Timers.inst.Remove(UpdateToCheckGuide);
-                }
-            }
-            if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-            // GuideController.TryGuide(_ui.m_btnZhaiXing.target, ConstGuideId.LUCKY_BOX, 2, "“摘星”里可以通过星辰的力量获得服饰");
-        }
-
-        private void UpdateToCheckGuide()
-        {
-            // TryGuideByGuideId(_ui.m_btnZhaiXing.target, ConstGuideId.MAIN_UI_BTN_ZHAI_XING, 1, false, "点击摘星按钮,进入抽奖界面")
-            if (!GuideController.TryGuideLuckyBox(_ui.m_btnZhaiXing.target))
-            {
-                if (GuideDataManager.GetGuideCount(ConstGuideId.MAIN_UI_BTN_ZHAI_XING) > 0 && GuideDataManager.GetGuideCount(ConstGuideId.MAIN_UI_BTN_HUAN_ZHUANG) <= 0)
-                {
-                    GuideController.TryGuideByGuideId(_ui.m_btnHuanZhuang.target, ConstGuideId.MAIN_UI_BTN_HUAN_ZHUANG, 1, false, "在这里,可以自由搭配服饰和分享哦~");
-                }
-                else if (GuideDataManager.GetGuideCount(ConstGuideId.MAIN_UI_BTN_HUAN_ZHUANG) > 0 && GuideDataManager.GetGuideCount(ConstGuideId.SUIT_SYNTHETIC_GUIDE) <= 0)
-                {
-                    GuideController.TryGuideMainUIViewBtnXiuFang(_ui.m_btnXiuFang.target);
-                }
-                else if (GuideDataManager.GetGuideCount(ConstGuideId.SUIT_SYNTHETIC_GUIDE) > 0 && GuideDataManager.GetGuideCount(ConstGuideId.PHOTOGRAPH_GUIDE) <= 0)
-                {
-                    GuideController.TryGuideOpenDressUpView(_ui.m_btnHuanZhuang.target);
-                }
-                else if (GuideDataManager.GetGuideCount(ConstGuideId.PHOTOGRAPH_GUIDE) > 0 && GuideDataManager.GetGuideCount(ConstGuideId.CARD_UP_STAR) <= 0)
-                {
-                    GuideController.TryGuideMainUIViewBtnCiPai(_ui.m_btnCiPai.target);
-                }
-
-            }
-
-
-
-        }
-        private void UpdateToCheckNewGuide(object param)
+        // private void UpdateToCheckGuide(object param)
+        // {
+        //     if (this.viewCom != null && this.viewCom.parent != null)
+        //     {
+        //         int index = this.viewCom.parent.GetChildIndex(this.viewCom);
+        //         if (index == this.viewCom.parent.numChildren - 1 && GRoot.inst.GetTopWindow() == null)
+        //         {
+        //             UpdateToCheckGuide();
+        //             Timers.inst.Remove(UpdateToCheckGuide);
+        //         }
+        //     }
+        //     if (!ViewManager.CheckIsTopView(this.viewCom)) return;
+        //     // GuideController.TryGuide(_ui.m_btnZhaiXing.target, ConstGuideId.LUCKY_BOX, 2, "“摘星”里可以通过星辰的力量获得服饰");
+        // }
+
+        // private void UpdateToCheckGuide()
+        // {
+        //     // TryGuideByGuideId(_ui.m_btnZhaiXing.target, ConstGuideId.MAIN_UI_BTN_ZHAI_XING, 1, false, "点击摘星按钮,进入抽奖界面")
+        //     if (!GuideController.TryGuideLuckyBox(_ui.m_btnZhaiXing.target))
+        //     {
+        //         if (GuideDataManager.GetGuideCount(ConstGuideId.MAIN_UI_BTN_ZHAI_XING) > 0 && GuideDataManager.GetGuideCount(ConstGuideId.MAIN_UI_BTN_HUAN_ZHUANG) <= 0)
+        //         {
+        //             GuideController.TryGuideByGuideId(_ui.m_btnHuanZhuang.target, ConstGuideId.MAIN_UI_BTN_HUAN_ZHUANG, 1, false, "在这里,可以自由搭配服饰和分享哦~");
+        //         }
+        //         else if (GuideDataManager.GetGuideCount(ConstGuideId.MAIN_UI_BTN_HUAN_ZHUANG) > 0 && GuideDataManager.GetGuideCount(ConstGuideId.SUIT_SYNTHETIC_GUIDE) <= 0)
+        //         {
+        //             GuideController.TryGuideMainUIViewBtnXiuFang(_ui.m_btnXiuFang.target);
+        //         }
+        //         else if (GuideDataManager.GetGuideCount(ConstGuideId.SUIT_SYNTHETIC_GUIDE) > 0 && GuideDataManager.GetGuideCount(ConstGuideId.PHOTOGRAPH_GUIDE) <= 0)
+        //         {
+        //             GuideController.TryGuideOpenDressUpView(_ui.m_btnHuanZhuang.target);
+        //         }
+        //         else if (GuideDataManager.GetGuideCount(ConstGuideId.PHOTOGRAPH_GUIDE) > 0 && GuideDataManager.GetGuideCount(ConstGuideId.CARD_UP_STAR) <= 0)
+        //         {
+        //             GuideController.TryGuideMainUIViewBtnCiPai(_ui.m_btnCiPai.target);
+        //         }
+
+        //     }
+
+
+
+        // }
+        protected override void UpdateToCheckGuide(object param)
         {
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
             GuideController.TryGuide(_ui.m_btnZhaiXing.target, ConstGuideId.LUCKY_BOX, 2, "“摘星”里可以通过星辰的力量获得服饰", false, 0, false);
             GuideController.TryGuide(_ui.m_btnZhaiXing.target, ConstGuideId.LUCKY_BOX, 2, "“摘星”里可以通过星辰的力量获得服饰", false, 0, false);

+ 13 - 4
GameClient/Assets/Game/HotUpdate/Views/UIView.cs

@@ -26,7 +26,6 @@ namespace GFGGame
         /// 设置是否全屏自适应
         /// 设置是否全屏自适应
         /// </summary>
         /// </summary>
         public bool isfullScreen { get; set; }
         public bool isfullScreen { get; set; }
-
         /// <summary>
         /// <summary>
         /// FairyGUI包名
         /// FairyGUI包名
         /// </summary>
         /// </summary>
@@ -72,7 +71,7 @@ namespace GFGGame
 
 
         public virtual void Dispose()
         public virtual void Dispose()
         {
         {
-            if(viewCom != null)
+            if (viewCom != null)
             {
             {
                 viewCom.RemoveFromParent();
                 viewCom.RemoveFromParent();
                 viewCom.Dispose();
                 viewCom.Dispose();
@@ -110,7 +109,7 @@ namespace GFGGame
 
 
         public virtual void Show()
         public virtual void Show()
         {
         {
-            
+
         }
         }
 
 
         public virtual void Hide()
         public virtual void Hide()
@@ -124,13 +123,23 @@ namespace GFGGame
             {
             {
                 MakeFullScreen(viewCom);
                 MakeFullScreen(viewCom);
             }
             }
+            if (GuideController.IsGuide())
+            {
+                Timers.inst.AddUpdate(UpdateToCheckGuide);
+            }
         }
         }
 
 
         virtual protected void OnHide()
         virtual protected void OnHide()
         {
         {
             viewData = null;
             viewData = null;
+
+            Timers.inst.Remove(UpdateToCheckGuide);
+
         }
         }
+        virtual protected void UpdateToCheckGuide(object param)
+        {
 
 
+        }
         protected virtual void DoShowAnimation()
         protected virtual void DoShowAnimation()
         {
         {
             OnShown();
             OnShown();
@@ -160,7 +169,7 @@ namespace GFGGame
 
 
         protected virtual void OnDoHideAnimationCompleted()
         protected virtual void OnDoHideAnimationCompleted()
         {
         {
-            if(this.viewCom != null)
+            if (this.viewCom != null)
             {
             {
                 this.viewCom.RemoveFromParent();
                 this.viewCom.RemoveFromParent();
             }
             }

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

@@ -37,13 +37,11 @@ namespace GFGGame
             _ui.m_component.target.scrollPane.SetPosX(0, false);
             _ui.m_component.target.scrollPane.SetPosX(0, false);
 
 
             GuideController.TryGuideSuitSyntheticView(_ui.m_component.m_btnSuitSynthetic);
             GuideController.TryGuideSuitSyntheticView(_ui.m_component.m_btnSuitSynthetic);
-            Timers.inst.AddUpdate(UpdateToCheckGuide);
         }
         }
 
 
         protected override void OnHide()
         protected override void OnHide()
         {
         {
             base.OnHide();
             base.OnHide();
-            Timers.inst.Remove(UpdateToCheckGuide);
         }
         }
 
 
         private void OnClickBtnBack()
         private void OnClickBtnBack()
@@ -74,7 +72,7 @@ namespace GFGGame
 
 
         }
         }
 
 
-        private void UpdateToCheckGuide(object param)
+        protected override void UpdateToCheckGuide(object param)
         {
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
 
 

BIN
GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes