Merge branch 'master' of http://mobile.secondworld.net.cn:10010/r/Project_S...

hch

2025-11-24 e4355fb806f10dcaf83fcdf3684672537d666e3e

Merge branch 'master' of http://mobile.secondworld.net.cn:10010/r/Project_SG_scripts

 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);
    }

 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,

 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()

 Main/System/TianziBillborad/TianziBillboradManager.cs

@@ -50,7 +50,7 @@
        todayLineID = 0;
        historyHurt = 0;
        todayHurt = 0;
        ClearBar();
       // ClearBar();
        isSkipSweepTip = false;
    }