|
|
@@ -27,8 +27,28 @@ namespace GFGGame
|
|
|
bool isGuide = GameGlobal.skipGuide == false && !isAllGuideFinish;
|
|
|
return isGuide;
|
|
|
}
|
|
|
+ /// <summary>
|
|
|
+ /// 检测当前角色等级是否有引导开启，若有则返回引导id
|
|
|
+ /// </summary>
|
|
|
+ /// <returns></returns>
|
|
|
+ public static string CheckHasRoleLvGuideOpen()
|
|
|
+ {
|
|
|
+ GuideCfg[] guideCfgs = GuideCfgArray.Instance.dataArray;
|
|
|
+
|
|
|
+ for (int i = 0; i < guideCfgs.Length; i++)
|
|
|
+ {
|
|
|
+ if (guideCfgs[i].roleLv <= 0) continue;
|
|
|
+ bool isFinishCurId = StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_GUIDE + guideCfgs[i].id) > 0;
|
|
|
+ if (!isFinishCurId)
|
|
|
+ {
|
|
|
+ return guideCfgs[i].viewName;
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
- public static bool TryGuide(GObject target, string guideKey, int index, string guideStr = null, int listIndex = -1, bool checkPriorIndex = true, int yTxt = 0, float devWidth = 0, float devHeight = 0, bool showAni = true)
|
|
|
+ return "";
|
|
|
+ }
|
|
|
+
|
|
|
+ public static bool TryGuide(GObject target, string guideKey, int index, string guideStr = null, int listIndex = -1, bool checkPriorIndex = true, int yTxt = 0, float devWidth = 0, float devHeight = 0, bool showAni = true, bool checkChapterPass = false, bool isOptionalGuide = false)
|
|
|
{
|
|
|
|
|
|
GuideCfg cfg = GuideCfgArray.Instance.GetCfg(guideKey);
|
|
|
@@ -39,9 +59,20 @@ namespace GFGGame
|
|
|
bool isFinishCurIndex = GuideDataManager.IsGuideIndexFinish(cfg.id, index) == true;//当前index未完成
|
|
|
bool isFinishPriorIndex = !checkPriorIndex || checkPriorIndex && GuideDataManager.IsGuideIndexFinish(cfg.id, index - 1) == true;//前置index已完成
|
|
|
bool isCfgChapterOpen = MainStoryDataManager.CheckLevelUnlock(cfg.storyLevelId);//引导配置关卡已开启
|
|
|
+ if (checkChapterPass && !isCfgChapterOpen)
|
|
|
+ {//cfg.storyLevelId为当前关卡，通关时 MainStoryDataManager.currentLevelCfgId为下一章的第一关，但下一章有可能因为角色等级不足未开启，会导致引导无法正常开启，所以添加是否通关检测
|
|
|
+ StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(cfg.storyLevelId);
|
|
|
+ if (levelCfg.chapterId - 1 > 0)
|
|
|
+ {
|
|
|
+ isCfgChapterOpen = MainStoryDataManager.CheckNeedChapterPass(levelCfg.chapterId - 1, out int needChapterId);
|
|
|
+ }
|
|
|
+ }
|
|
|
bool isCfgChapter = MainStoryDataManager.currentLevelCfgId == 0 || MainStoryDataManager.currentLevelCfgId == cfg.storyLevelId;//无选择（进入游戏时无选择）或当前所选择为配置关卡
|
|
|
|
|
|
- if (isStoryLevelGuide && !isFinishCurId && isFinishPriorId && !isFinishCurIndex && isFinishPriorIndex && isCfgChapterOpen && isCfgChapter || !isStoryLevelGuide && !isFinishCurId)
|
|
|
+ bool isRoleLvGuide = cfg.roleLv > 0;
|
|
|
+ bool iscurRoleLv = RoleDataManager.lvl >= cfg.roleLv;
|
|
|
+
|
|
|
+ if (isStoryLevelGuide && !isFinishCurId && isFinishPriorId && !isFinishCurIndex && isFinishPriorIndex && isCfgChapterOpen && isCfgChapter || !isStoryLevelGuide && !isRoleLvGuide && !isFinishCurId || isRoleLvGuide && !isFinishCurId && iscurRoleLv)
|
|
|
{
|
|
|
GuideDataManager.currentGuideId = cfg.id;
|
|
|
GuideDataManager.currentGuideIdIndex = index;
|
|
|
@@ -64,7 +95,8 @@ namespace GFGGame
|
|
|
return false;
|
|
|
}
|
|
|
}
|
|
|
- ShowGuideByIndex(target, guideStr, yTxt, cfg.optionalGuide == 1, devWidth, devHeight, GuideDataManager.currentGuideId, GuideDataManager.currentGuideIdIndex, showAni);
|
|
|
+ bool _isOptionalGuide = isOptionalGuide ? isOptionalGuide : cfg.optionalGuide == 1;
|
|
|
+ ShowGuideByIndex(target, guideStr, yTxt, _isOptionalGuide, devWidth, devHeight, GuideDataManager.currentGuideId, GuideDataManager.currentGuideIdIndex, showAni);
|
|
|
if (!checkPriorIndex)
|
|
|
{
|
|
|
for (int i = 1; i < index; i++)
|
zhaoyang