From e4355fb806f10dcaf83fcdf3684672537d666e3e Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期一, 24 十一月 2025 10:57:56 +0800
Subject: [PATCH] Merge branch 'master' of http://mobile.secondworld.net.cn:10010/r/Project_SG_scripts
---
Main/System/PhantasmPavilion/PhantasmPavilionManager.Redpoint.cs | 22 +++++++++++++---------
Main/System/PhantasmPavilion/PhantasmPavilionManager.cs | 10 ++++++++++
Main/System/TianziBillborad/TianziBillboradManager.cs | 2 +-
Main/System/BoneField/BoneFieldChallengeButton.cs | 1 -
4 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/Main/System/BoneField/BoneFieldChallengeButton.cs b/Main/System/BoneField/BoneFieldChallengeButton.cs
index 7a497f9..e3d552d 100644
--- a/Main/System/BoneField/BoneFieldChallengeButton.cs
+++ b/Main/System/BoneField/BoneFieldChallengeButton.cs
@@ -27,7 +27,6 @@
txtChallengeLv.text = Language.Get("BoneField07", lvLimitMin);
txtChallengeYes.SetActive(isLvOk && isHasNextLineID);
txtChallengeNo.SetActive(!isLvOk || !isHasNextLineID);
- imgChallengeLVYes.SetActive(isLvOk && isHasNextLineID);
imgChallengeLVYes.gray = !isLvOk || !isHasNextLineID;
imgChallengeIcon.SetActive(isLvOk && isHasNextLineID);
}
diff --git a/Main/System/PhantasmPavilion/PhantasmPavilionManager.Redpoint.cs b/Main/System/PhantasmPavilion/PhantasmPavilionManager.Redpoint.cs
index 22e8364..5475be0 100644
--- a/Main/System/PhantasmPavilion/PhantasmPavilionManager.Redpoint.cs
+++ b/Main/System/PhantasmPavilion/PhantasmPavilionManager.Redpoint.cs
@@ -4,13 +4,14 @@
public partial class PhantasmPavilionManager : GameSystemManager<PhantasmPavilionManager>
{
- public Redpoint parentRedpoint = new Redpoint(MainRedDot.MainAffairsRedpoint, MainRedDot.PhantasmPavilionRepoint);
+ //澶村儚鍏ュ彛鐢�
+ public Redpoint parentRedpoint = new Redpoint(MainRedDot.PhantasmPavilionRepoint);
+ //鍐呮斂鐢�
+ public Redpoint parentRedpoint2 = new Redpoint(MainRedDot.MainAffairsRedpoint, MainRedDot.PhantasmPavilionRepoint * 100 + (int)PhantasmPavilionRepointType.MainAffairs);
public Dictionary<PhantasmPavilionRepointType, Redpoint> tabRedPointDict = new Dictionary<PhantasmPavilionRepointType, Redpoint>();
private void InitTabRedPoint()
{
-
-
tabRedPointDict[PhantasmPavilionRepointType.Model] = new Redpoint(MainRedDot.PhantasmPavilionRepoint, GetRedpointId(PhantasmPavilionRepointType.Model));
tabRedPointDict[PhantasmPavilionRepointType.Face] = new Redpoint(MainRedDot.PhantasmPavilionRepoint, GetRedpointId(PhantasmPavilionRepointType.Face));
tabRedPointDict[PhantasmPavilionRepointType.Title] = new Redpoint(MainRedDot.PhantasmPavilionRepoint, GetRedpointId(PhantasmPavilionRepointType.Title));
@@ -85,8 +86,7 @@
public void UpdateItemRedPoint(Image imgRed, PhantasmPavilionType type, int id)
{
imgRed.SetActive(false);
- if (!IsFuncOpen())
- return;
+
if (!Has(type, id))
return;
PhantasmPavilionState state = GetUnLockState(type, id);
@@ -121,6 +121,7 @@
public void UpdateRedPoint()
{
parentRedpoint.state = RedPointState.None;
+ parentRedpoint2.state = RedPointState.None;
if (!tabRedPointDict.IsNullOrEmpty())
{
@@ -129,10 +130,6 @@
item.Value.state = RedPointState.None;
}
}
-
-
- if (!IsFuncOpen())
- return;
// 鏈夊彲鎵嬪姩瑙ｉ攣鐨�
UpdateRedPointByCanActivate(PhantasmPavilionType.Model, PhantasmPavilionRepointType.ModelNormal, 1);
@@ -161,6 +158,11 @@
UpdateRedPointByNoSee(PhantasmPavilionType.Title, PhantasmPavilionRepointType.TitlePalace, 1);
UpdateRedPointByNoSee(PhantasmPavilionType.Title, PhantasmPavilionRepointType.TitleEvent, 2);
+
+ if (IsFuncOpen())
+ {
+ parentRedpoint2.state = parentRedpoint.state;
+ }
}
public List<int> newHeroIDModelList = new List<int>();
@@ -275,6 +277,8 @@
public enum PhantasmPavilionRepointType
{
+ MainAffairs = 99, //鍐呮斂鍏ュ彛鐢�
+
Model = 10,
Face = 20,
Title = 30,
diff --git a/Main/System/PhantasmPavilion/PhantasmPavilionManager.cs b/Main/System/PhantasmPavilion/PhantasmPavilionManager.cs
index e80f837..cd49149 100644
--- a/Main/System/PhantasmPavilion/PhantasmPavilionManager.cs
+++ b/Main/System/PhantasmPavilion/PhantasmPavilionManager.cs
@@ -52,6 +52,7 @@
PlayerDatas.Instance.playerDataRefreshEvent += OnPlayerDataRefreshEvent;
PackManager.Instance.RefreshItemEvent += OnRefreshItemEvent;
GlobalTimeEvent.Instance.secondEvent += OnSecondEvent;
+ FuncOpen.Instance.OnFuncStateChangeEvent += OnFuncStateChangeEvent;
InitTable();
InitTabRedPoint();
}
@@ -63,6 +64,15 @@
PlayerDatas.Instance.playerDataRefreshEvent -= OnPlayerDataRefreshEvent;
PackManager.Instance.RefreshItemEvent -= OnRefreshItemEvent;
GlobalTimeEvent.Instance.secondEvent -= OnSecondEvent;
+ FuncOpen.Instance.OnFuncStateChangeEvent -= OnFuncStateChangeEvent;
+ }
+
+ private void OnFuncStateChangeEvent(int obj)
+ {
+ if (obj == funcId)
+ {
+ UpdateRedPoint();
+ }
}
private void OnSecondEvent()
diff --git a/Main/System/TianziBillborad/TianziBillboradManager.cs b/Main/System/TianziBillborad/TianziBillboradManager.cs
index bfb9910..3bef2f5 100644
--- a/Main/System/TianziBillborad/TianziBillboradManager.cs
+++ b/Main/System/TianziBillborad/TianziBillboradManager.cs
@@ -50,7 +50,7 @@
todayLineID = 0;
historyHurt = 0;
todayHurt = 0;
- ClearBar();
+ // ClearBar();
isSkipSweepTip = false;
}
--
Gitblit v1.8.0