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

hch

1 天以前 ef8a6cfe6c409639c6f33bda3f678d53703e1d8f

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

 Main/System/Guild/GuildEmblemSelectCell.cs

@@ -7,7 +7,7 @@
public class GuildEmblemSelectCell : MonoBehaviour
{
    [SerializeField] GuildEmblemCell emblemIcon;
    [SerializeField] Image useImg;
    [SerializeField] TextEx usetext;
    [SerializeField] Image lockImg;
    [SerializeField] Image selectImg;
    [SerializeField] Button selectBtn;
@@ -19,11 +19,11 @@
        emblemIcon.Display(id, "", 0.5f);
        if (PlayerDatas.Instance.fairyData.fairy == null)
        {
            useImg.SetActive(false);
            usetext.SetActive(false);
        }
        else
        {
            useImg.SetActive(id == PlayerDatas.Instance.fairyData.fairy.EmblemID);
            usetext.SetActive(id == PlayerDatas.Instance.fairyData.fairy.EmblemID);
        }
        lockImg.SetActive(!GuildEmblemModel.Instance.IsUnLock(id));
        selectImg.SetActive(id == GuildEmblemModel.Instance.nowChooseEmblemId);

 Main/System/HeroUI/HeroCardCell.cs

@@ -14,6 +14,8 @@
    [SerializeField] RedpointBehaviour redpoint;
    [SerializeField] Image newImage;    //新标识和红点互斥
    [SerializeField] Image trainStateImg;
    [SerializeField] TextEx trainStatetxt;
    [SerializeField] OutlineEx trainStateOutline;
    [SerializeField] Image starRedImg;
    [SerializeField] Text nameText;
    [SerializeField] Image awakeImg;
@@ -48,7 +50,7 @@
            newImage.SetActive(false);
        }
        else
        { 
        {
            redpoint.redpointId = 0;
            newImage.SetActive(HeroUIManager.Instance.newHeroIDList.Contains(hero.heroId));
        }
@@ -58,6 +60,22 @@
        {
            trainStateImg.SetActive(true);
            trainStateImg.SetSprite("herofuncstate" + funcState);
            trainStatetxt.text = funcState switch
            {
                1 => Language.Get("herocard41"),
                2 => Language.Get("HeroGift3"),
                3 => Language.Get("L1111"),
                4 => Language.Get("L1109"),
                _ => string.Empty,
            };
            trainStateOutline.OutlineColor = funcState switch
            {
                1 => new Color32(0x5c, 0x2b, 0x2b, 255),
                2 => new Color32(0x5c, 0x46, 0x2b, 255),
                3 => new Color32(0x2b, 0x3d, 0x5c, 255),
                4 => new Color32(0x2e, 0x5c, 0x2b, 255),
                _ => Color.white,
            };
        }
        else
        {

 Main/System/HeroUI/HeroCollectionCardCell.cs

@@ -12,6 +12,8 @@
    [SerializeField] Image jobImg;
    [SerializeField] Text nameText;
    [SerializeField] Image trainStateImg;
    [SerializeField] TextEx trainStatetxt;
    [SerializeField] OutlineEx trainStateOutline;
    [SerializeField] RedpointBehaviour redpoint;
    // [SerializeField] Button bookLVBtn;
    [SerializeField] GameObject unGetObj;
@@ -46,6 +48,8 @@
        {
            trainStateImg.SetActive(true);
            trainStateImg.SetSprite("herofuncstate4");
            trainStatetxt.text = Language.Get("L1109");
            trainStateOutline.OutlineColor =  new Color32(0x2e, 0x5c, 0x2b, 255);
        }
        else
        {
@@ -72,7 +76,7 @@
                UIManager.Instance.OpenWindow<HeroBestBaseWin>();
            }
        });
        

        // bookLVBtn.AddListener(() =>
        // {
        //     HeroUIManager.Instance.selectCollectHeroID = heroID;

 Main/System/HeroUI/HeroCollectionWin.cs

@@ -169,6 +169,20 @@
        {
            var _cell = cell.GetComponent<Image>();
            _cell.SetSprite("herocoltitle" + cell.index);

            var title = cell.GetComponentInChildren<Text>();
            title.text = RichTextMsgReplaceConfig.GetRichReplace("HeroQuality", cell.index);

            var outlineEx = title.GetComponent<OutlineEx>();
            outlineEx.OutlineColor = cell.index switch
            {
                1 => new Color32(0x17, 0x25, 0x43, 255),
                2 => new Color32(0x2a, 0x0f, 0x30, 255),
                3 => new Color32(0x4a, 0x2f, 0x00, 255),
                4 => new Color32(0x45, 0x18, 0x00, 255),
                5 => new Color32(0x51, 0x00, 0x00, 255),
                _ => Color.white,
            };
        }
        else if (type == ScrollerDataType.Normal)
        {