From 7f6a079e18601e8d7c5d0062e80bea88c5731a4c Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期四, 23 十月 2025 16:01:36 +0800
Subject: [PATCH] 0312 优化引导下的一键上阵; 修复引导导致物品掉落卡住主线战斗问题
---
Main/System/HeroUI/HeroPosWin.cs | 14 +-------------
Main/System/HeroUI/HeroUIManager.OnTeam.cs | 2 +-
Main/System/NewBieGuidance/NewBieCenter.cs | 3 ++-
Main/System/HeroUI/HeroUIManager.cs | 2 +-
4 files changed, 5 insertions(+), 16 deletions(-)
diff --git a/Main/System/HeroUI/HeroPosWin.cs b/Main/System/HeroUI/HeroPosWin.cs
index ab8a8f2..00bdc64 100644
--- a/Main/System/HeroUI/HeroPosWin.cs
+++ b/Main/System/HeroUI/HeroPosWin.cs
@@ -474,21 +474,9 @@
team.RemoveAllHeroes();
if (NewBieCenter.Instance.inGuiding && NewBieCenter.Instance.currentGuide == HeroUIManager.Instance.onekeyGuideID)
{
- //绗簩涓己鍒舵帓鍦�5鍙蜂綅
- if (guidList.Count > 1)
- {
- team.AddHero(HeroManager.Instance.GetHero(guidList[1]), 4, true);
- guidList.RemoveAt(1);
- }
-
for (int i = 0; i < guidList.Count; i++)
{
- int index = i;
- if (i >= 4)
- {
- index = i + 1;
- }
- team.AddHero(HeroManager.Instance.GetHero(guidList[i]), index, true);
+ team.AddHero(HeroManager.Instance.GetHero(guidList[i]), HeroUIManager.Instance.onekeyGuidePosList[i] - 1, true);
}
}
diff --git a/Main/System/HeroUI/HeroUIManager.OnTeam.cs b/Main/System/HeroUI/HeroUIManager.OnTeam.cs
index e3a740c..73d39ac 100644
--- a/Main/System/HeroUI/HeroUIManager.OnTeam.cs
+++ b/Main/System/HeroUI/HeroUIManager.OnTeam.cs
@@ -384,7 +384,7 @@
public int[] teamSortByJob;
public int onekeyGuideID;
- public int onekeyGuideFirstPos; //涓�閿笂闃靛湪寮曞涓嬬殑鏈�浼樺厛鎺ㄨ崘浣嶇疆
+ public int[] onekeyGuidePosList; //涓�閿笂闃靛湪寮曞涓嬬殑椤哄簭
public Action OnUnLockHeroCountEvent;
public int lockState
diff --git a/Main/System/HeroUI/HeroUIManager.cs b/Main/System/HeroUI/HeroUIManager.cs
index 9bcc3ee..2e556e0 100644
--- a/Main/System/HeroUI/HeroUIManager.cs
+++ b/Main/System/HeroUI/HeroUIManager.cs
@@ -71,7 +71,7 @@
lockHeroCountLimit = JsonMapper.ToObject<int[][]>(config.Numerical1);
teamSortByJob = JsonMapper.ToObject<int[]>(config.Numerical2);
onekeyGuideID = int.Parse(config.Numerical3);
- onekeyGuideFirstPos = int.Parse(config.Numerical4);
+ onekeyGuidePosList = JsonMapper.ToObject<int[]>(config.Numerical4);
}
diff --git a/Main/System/NewBieGuidance/NewBieCenter.cs b/Main/System/NewBieGuidance/NewBieCenter.cs
index 9611412..6dae9d9 100644
--- a/Main/System/NewBieGuidance/NewBieCenter.cs
+++ b/Main/System/NewBieGuidance/NewBieCenter.cs
@@ -24,7 +24,8 @@
public bool inGuiding
{
- get { return currentGuide != 0; }
+ // 褰撳墠鏈夊紩瀵硷紝骞朵笖涓嶆槸鏆傚仠鐘舵�侊紝鍒欏湪寮曞涓�
+ get { return currentGuide != 0 && IsPauseStoryBattleState(); }
}
List<int> allGuides = new List<int>();
--
Gitblit v1.8.0