Merge branch 'master' into h5version

yyl

2026-05-11 51b0f6ed9f4e1d3bb6f8144470b46908c7699a96

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
using UnityEngine;
using UnityEngine.UI;
using Cysharp.Threading.Tasks;
 
//羁绊中的武将
public class HeroConnectionHeadCell : MonoBehaviour
{
    [SerializeField] Image qualityImg;
    [SerializeField] ImageEx heroIcon;
    [SerializeField] Text nameText;
    [SerializeField] Image connMarkImg; //链接的锁图标，第一个不显示
 
    /// <summary>
    /// 
    /// </summary>
    /// <param name="heroID"></param>
    /// <param name="index"> 只是为了让第一个不显示锁图标用</param>
    /// <param name="showCollect">是否按收集显示置灰状态</param>
    /// <param name="_skinID">指定皮肤</param>
    public void Display(int heroID, int index, bool showCollect = false,  int _skinID = 0)
    {
        int skinID = 0;
        HeroConfig heroConfig = HeroConfig.Get(heroID);
        if (_skinID != 0)
        {
            skinID = _skinID;
        }
        else
        {
            skinID = heroConfig.SkinIDList[0];  //默认第一个图鉴展示
 
        }
 
        nameText.text = heroConfig.Name;
        qualityImg.SetSprite("heroheadBG" + heroConfig.Quality);
        
        UILoader.LoadSpriteAsync("HeroHead", HeroSkinConfig.Get(skinID).SquareIcon).ContinueWith(sprite =>
        {
            if (this == null || heroIcon == null) return;
            if (sprite == null)
            {
                // 内网未配置时
                heroIcon.SetSprite("herohead_default");
            }
            else
            {
                heroIcon.overrideSprite = sprite;
            }
 
            if (showCollect)
            { 
                //未获得武将要置灰
                heroIcon.gray = !HeroManager.Instance.HasHero(heroID);
 
            }
 
            connMarkImg.SetActive(index != 0);
        }).Forget();
 
        connMarkImg.SetActive(index != 0);
    }
 
    public async UniTask DisplayAsync(int heroID, int index, bool showCollect = false, int _skinID = 0)
    {
        int skinID = 0;
        HeroConfig heroConfig = HeroConfig.Get(heroID);
        if (_skinID != 0)
        {
            skinID = _skinID;
        }
        else
        {
            skinID = heroConfig.SkinIDList[0];  //默认第一个图鉴展示
 
        }
 
        nameText.text = heroConfig.Name;
        qualityImg.SetSprite("heroheadBG" + heroConfig.Quality);
        var sprite = await UILoader.LoadSpriteAsync("HeroHead", HeroSkinConfig.Get(skinID).SquareIcon);
        if (this == null) return;
        if (sprite == null)
        {
            // 内网未配置时
            heroIcon.SetSprite("herohead_default");
        }
        else
        {
            heroIcon.overrideSprite = sprite;
        }
 
        if (showCollect)
        { 
            //未获得武将要置灰
            heroIcon.gray = !HeroManager.Instance.HasHero(heroID);
 
        }
 
        connMarkImg.SetActive(index != 0);
    }
}