|
@@ -59,7 +59,6 @@ namespace Fort23.Mono
|
|
|
|
|
|
callback?.Invoke(useCount, useItems);
|
|
|
UIManager.Instance.HideUIUIPanel(this);
|
|
|
-
|
|
|
});
|
|
|
Btn_Close.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
|
|
|
Slider_Count.onValueChanged.AddListener((c) => { Slider_Count_OnValueChanged(c); });
|
|
@@ -67,15 +66,19 @@ namespace Fort23.Mono
|
|
|
Btn_Tip.onClick.AddListener(() => { DivineSenceLevelPreviewPanel.OpenPanel(); });
|
|
|
|
|
|
|
|
|
- Btn_Event.onClick.AddListener(() => { DivineSenceEventPreviewPanel.OpenPanel(); });
|
|
|
+ Btn_Event.onClick.AddListener(async () =>
|
|
|
+ {
|
|
|
+ await DivineSenceEventPreviewPanel.OpenPanel();
|
|
|
+ UIManager.Instance.HideUIUIPanel(this,isBreadcrumbBarPanel:false);
|
|
|
+ });
|
|
|
}
|
|
|
|
|
|
private void Slider_Count_OnValueChanged(float value)
|
|
|
{
|
|
|
useCount = (int)value;
|
|
|
- Text_Count.text = LanguageManager.Instance.Text(10253,value);
|
|
|
+ Text_Count.text = LanguageManager.Instance.Text(10253, value);
|
|
|
// Text_shenshishangxian.text = $"({EventSystemManager.Instance.GetShenShiCount()}<color=green>+{value}</color>/{maxCount})";
|
|
|
- Text_shenshishangxian.text = $"({EventSystemManager.Instance.GetShenShiCount() + value }/{maxCount})";
|
|
|
+ Text_shenshishangxian.text = $"({EventSystemManager.Instance.GetShenShiCount() + value}/{maxCount})";
|
|
|
foreach (var senceInfoBtnWidget in _divineSenceInfoBtnWidgets)
|
|
|
{
|
|
|
senceInfoBtnWidget.UpdateItermCount(useCount);
|
|
@@ -88,12 +91,15 @@ namespace Fort23.Mono
|
|
|
{
|
|
|
PlayerGuideManager.Instance.NextGuide();
|
|
|
}
|
|
|
+
|
|
|
if (PlayerGuideManager.Instance.GuideIsCanDo(3, 1))
|
|
|
{
|
|
|
PlayerGuideManager.Instance.NextGuide();
|
|
|
}
|
|
|
+
|
|
|
_divineSenceInfoBtnWidgets.Clear();
|
|
|
- divineSenseConfig = ConfigComponent.Instance.Get<DivineSenseConfig>(AccountFileInfo.Instance.playerData.divineSenseLevel);
|
|
|
+ divineSenseConfig =
|
|
|
+ ConfigComponent.Instance.Get<DivineSenseConfig>(AccountFileInfo.Instance.playerData.divineSenseLevel);
|
|
|
HeroPowerUpConfig heroPowerUpConfig = PlayerManager.Instance.myHero.powerUpConfig;
|
|
|
|
|
|
Text_Level.text =
|
|
@@ -102,10 +108,13 @@ namespace Fort23.Mono
|
|
|
Slider_Exp.maxValue = divineSenseConfig.exp;
|
|
|
Slider_Exp.value = AccountFileInfo.Instance.playerData.divineSenseexp;
|
|
|
|
|
|
- int count = (int)(AccountFileInfo.Instance.playerData.divineSensePoint / PlayerManager.Instance.gameConstantConfig.DetectEventCount);
|
|
|
+ int count = (int)(AccountFileInfo.Instance.playerData.divineSensePoint /
|
|
|
+ PlayerManager.Instance.gameConstantConfig.DetectEventCount);
|
|
|
maxCount = heroPowerUpConfig.ShenshiMax / PlayerManager.Instance.gameConstantConfig.DetectEventCount;
|
|
|
- maxCount = maxCount > 10 ? 10 : maxCount;
|
|
|
- count = count + EventSystemManager.Instance.GetShenShiCount() > maxCount ? maxCount - EventSystemManager.Instance.GetShenShiCount() : count;
|
|
|
+ maxCount = maxCount > divineSenseConfig.MaxNum ? divineSenseConfig.MaxNum : maxCount;
|
|
|
+ count = count + EventSystemManager.Instance.GetShenShiCount() > maxCount
|
|
|
+ ? maxCount - EventSystemManager.Instance.GetShenShiCount()
|
|
|
+ : count;
|
|
|
|
|
|
|
|
|
if (count == 1)
|
|
@@ -132,11 +141,15 @@ namespace Fort23.Mono
|
|
|
Text_qs[i].text = $"{probabilities[i] * 100:F2}%";
|
|
|
}
|
|
|
|
|
|
- DivineSenceInfoBtnWidget divineSenceInfoBtnWidget = await UIManager.Instance.CreateGComponentForObject<DivineSenceInfoBtnWidget>(DivineSenceInfoBtnWidgetGam0, null);
|
|
|
+ DivineSenceInfoBtnWidget divineSenceInfoBtnWidget =
|
|
|
+ await UIManager.Instance.CreateGComponentForObject<DivineSenceInfoBtnWidget>(
|
|
|
+ DivineSenceInfoBtnWidgetGam0, null);
|
|
|
divineSenceInfoBtnWidget.CustomInit(-1, 1);
|
|
|
divineSenceInfoBtnWidget.OnClick = OnClick;
|
|
|
_divineSenceInfoBtnWidgets.Add(divineSenceInfoBtnWidget);
|
|
|
- divineSenceInfoBtnWidget = await UIManager.Instance.CreateGComponentForObject<DivineSenceInfoBtnWidget>(DivineSenceInfoBtnWidgetGam1, null);
|
|
|
+ divineSenceInfoBtnWidget =
|
|
|
+ await UIManager.Instance.CreateGComponentForObject<DivineSenceInfoBtnWidget>(
|
|
|
+ DivineSenceInfoBtnWidgetGam1, null);
|
|
|
divineSenceInfoBtnWidget.CustomInit(-1, 2);
|
|
|
divineSenceInfoBtnWidget.OnClick = OnClick;
|
|
|
_divineSenceInfoBtnWidgets.Add(divineSenceInfoBtnWidget);
|
|
@@ -157,7 +170,8 @@ namespace Fort23.Mono
|
|
|
List<int> selectType = new List<int>();
|
|
|
foreach (var senceInfoBtnWidget in _divineSenceInfoBtnWidgets)
|
|
|
{
|
|
|
- if (senceInfoBtnWidget != divineSenceInfoBtnWidget && senceInfoBtnWidget.type != 1 && senceInfoBtnWidget.ItemInfo != null)
|
|
|
+ if (senceInfoBtnWidget != divineSenceInfoBtnWidget && senceInfoBtnWidget.type != 1 &&
|
|
|
+ senceInfoBtnWidget.ItemInfo != null)
|
|
|
{
|
|
|
selectType.Add(senceInfoBtnWidget.ItemInfo.config.associateID);
|
|
|
}
|
|
@@ -181,15 +195,18 @@ namespace Fort23.Mono
|
|
|
Map<int, int> probabilitiesMap = new Map<int, int>();
|
|
|
foreach (var senceInfoBtnWidget in _divineSenceInfoBtnWidgets)
|
|
|
{
|
|
|
- if (senceInfoBtnWidget.type == 2 && senceInfoBtnWidget.ItemInfo != null && senceInfoBtnWidget.ItemInfo.config.associateID == 6)
|
|
|
+ if (senceInfoBtnWidget.type == 2 && senceInfoBtnWidget.ItemInfo != null &&
|
|
|
+ senceInfoBtnWidget.ItemInfo.config.associateID == 6)
|
|
|
{
|
|
|
if (!probabilitiesMap.ContainsKey(senceInfoBtnWidget.ItemInfo.config.associateVlaue[0]))
|
|
|
{
|
|
|
- probabilitiesMap.Add(senceInfoBtnWidget.ItemInfo.config.associateVlaue[0], senceInfoBtnWidget.ItemInfo.config.associateVlaue[1]);
|
|
|
+ probabilitiesMap.Add(senceInfoBtnWidget.ItemInfo.config.associateVlaue[0],
|
|
|
+ senceInfoBtnWidget.ItemInfo.config.associateVlaue[1]);
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- probabilitiesMap[senceInfoBtnWidget.ItemInfo.config.associateVlaue[0]] += senceInfoBtnWidget.ItemInfo.config.associateVlaue[1];
|
|
|
+ probabilitiesMap[senceInfoBtnWidget.ItemInfo.config.associateVlaue[0]] +=
|
|
|
+ senceInfoBtnWidget.ItemInfo.config.associateVlaue[1];
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -213,7 +230,8 @@ namespace Fort23.Mono
|
|
|
|
|
|
public async static CTask OpenPanel(Action<int, List<ItemInfo>> callback)
|
|
|
{
|
|
|
- DivineSenceInfoPanel divineSenceInfoPanel = await UIManager.Instance.LoadAndOpenPanel<DivineSenceInfoPanel>(null, UILayer.Middle);
|
|
|
+ DivineSenceInfoPanel divineSenceInfoPanel =
|
|
|
+ await UIManager.Instance.LoadAndOpenPanel<DivineSenceInfoPanel>(null, UILayer.Middle);
|
|
|
divineSenceInfoPanel.CustomInit(callback);
|
|
|
}
|
|
|
}
|