Merge remote-tracking branch 'origin/master' into h5version

yyl

2026-03-26 f4a702e212d1853735f8dae399da69d23bfa510e

 Main/System/PhantasmPavilion/PhantasmPavilionFaceHandler.cs

@@ -8,7 +8,20 @@
    }
    public List<int> GetKeyList()
    {
        return PlayerFaceConfig.GetKeys();
        List<int> allKeys = PlayerFaceConfig.GetKeys();
        List<int> validKeys = new List<int>();

        for (int i = 0; i < allKeys.Count; i++)
        {
            int id = allKeys[i];
            var faceCfg = PlayerFaceConfig.Get(id);
            // 过滤未达到开服天数的武将和皮肤头像
            if (PhantasmPavilionManager.Instance.IsFaceOrModelVisible(faceCfg.UnlockWay, faceCfg.UnlockValue))
            {
                validKeys.Add(id);
            }
        }
        return validKeys;
    }
    public int GetResourceType(int id)
    {
@@ -63,5 +76,8 @@
    {
        return PlayerFaceConfig.Get(id).GetWayString;
    }

    public int GetSortIndex(int id)
    {
        return PlayerFaceConfig.Get(id).SortIndex;
    }
}