From f4a702e212d1853735f8dae399da69d23bfa510e Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期四, 26 三月 2026 18:16:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into h5version
---
Main/System/BeautyMM/BeautyMMManager.cs | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/Main/System/BeautyMM/BeautyMMManager.cs b/Main/System/BeautyMM/BeautyMMManager.cs
index 067c44c..ea2f0ce 100644
--- a/Main/System/BeautyMM/BeautyMMManager.cs
+++ b/Main/System/BeautyMM/BeautyMMManager.cs
@@ -41,7 +41,7 @@
public Dictionary<int, long> allMMTalentAttr = new Dictionary<int, long>();
public Dictionary<int, int> allMMTalentEffect = new Dictionary<int, int>();
-
+ public Dictionary<int, int> beautyIDGuideDic= new Dictionary<int, int>();
public override void Init()
{
@@ -86,7 +86,10 @@
maxGirds = travelRowCol[0] * travelRowCol[1];
addEnergyItemID = int.Parse(config.Numerical4);
addEnergyValue = int.Parse(config.Numerical5);
-
+
+ config = FuncConfigConfig.Get("Guide");
+ beautyIDGuideDic = ConfigParse.ParseIntDict(config.Numerical2);
+
}
@@ -669,6 +672,15 @@
return 3;
}
break;
+
+ case 8:
+ WarlordPavilionManager.Instance.TryGetHistoryMaxFinishProgress(out int layerNum, out int levelNum);
+ FBDJGLevelConfig.TryGetNextLevel(layerNum, levelNum, out int nextLayerNum, out int nextLevelNum);
+ if (nextLayerNum > beauty.UnlockValue)
+ {
+ return 3;
+ }
+ break;
}
@@ -775,6 +787,7 @@
// 2.婕旀鍦烘寫鎴樿儨鍒╋紝姒傜巼棰濆鑾峰緱1涓墿鍝佺殑姒傜巼 鐗╁搧ID 姒傜巼
// 3.娓稿巻浣撳姏涓婇檺澧炲姞 鏃� 澧炲姞涓婇檺
// 4.鐧介鐩堥噹鎵崱棰濆鐗╁搧濂栧姳 鐗╁搧ID 涓暟
+// 5. 閬ｆ暎/鍚炲櫖姝﹀皢棰濆杩旇繕 鏃� 鐧惧垎姣�
public enum TalentEffectType
{
@@ -782,5 +795,6 @@
Arena = 2,
Travel = 3,
BoneField = 4,
+ HeroDelete = 5,
}
--
Gitblit v1.8.0