yyl
3 天以前 6277d77214cd861c0a537b47c600240b30e1a4d4
Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
4个文件已修改
23 ■■■■■ 已修改文件
Main/System/ItemTip/ItemTipUtility.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Main/System/Main/HeroFightingCardCell.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Main/System/Settlement/BattleFailWin.cs 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Main/System/Settlement/BoneBattleFailWin.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Main/System/ItemTip/ItemTipUtility.cs
@@ -249,6 +249,15 @@
            return;
        }
        if (showGetWay)
        {
            //验证有没配置获取途径
            if (ItemConfig.Get(itemId).GetWay.Length == 0)
            {
                showGetWay = false;
            }
        }
        Show(new ItemViewInfo()
        {
            itemId = itemId,
Main/System/Main/HeroFightingCardCell.cs
@@ -133,6 +133,7 @@
                {
                    HeroUIManager.Instance.OnUnLockHeroCountEvent?.Invoke();
                    SysNotifyMgr.Instance.ShowTip("HeroCountUnLock5", TeamConst.MaxTeamHeroCount - HeroUIManager.Instance.lockIndexList.Count);
                    NewBieCenter.Instance.StartNewBieGuide(95);
                };
                unlockEffect.Play();
            }
Main/System/Settlement/BattleFailWin.cs
@@ -4,7 +4,7 @@
//战场结算界面,存在多个的情况
public class BattleFailWin : UIBase
{
    [SerializeField] Button tipHeroCultivateBtn;
    [SerializeField] Button tipEquipBtn;
    [SerializeField] Button tipHeroPosBtn;
    [SerializeField] ButtonEx detailBtn;
@@ -12,6 +12,11 @@
    
    protected override void InitComponent()
    {
        tipHeroCultivateBtn.AddListener(() =>
        {
            CloseWindow();
        });
        tipEquipBtn.AddListener(() =>
        {
            CloseWindow();
Main/System/Settlement/BoneBattleFailWin.cs
@@ -5,12 +5,18 @@
public class BoneBattleFailWin : UIBase
{
    [SerializeField] TextEx txtFuncName;
    [SerializeField] Button tipHeroCultivateBtn;
    [SerializeField] Button tipEquipBtn;
    [SerializeField] Button tipHeroPosBtn;
    [SerializeField] ButtonEx detailBtn;
    string battleName = BattleConst.BoneBattleField;
    protected override void InitComponent()
    {
        tipHeroCultivateBtn.AddListener(() =>
        {
            CloseWindow();
        });
        tipEquipBtn.AddListener(() =>
        {
            CloseWindow();