Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts

yyl

1 天以前 a8f9677ac1f8e5190b450c68121ef9537dfdea53

Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts

 Main/System/BattleDetail/BattleDetailHeroInfoItem.cs

@@ -61,9 +61,9 @@
        txtLV.text = StringUtility.Concat(Language.Get("L1094"), info.LV.ToString());
        DisplayStars(info.Star);

        DisplaySlider(imgAtkHurt, txtAtkHurt, info.AtkHurt, data.maxAtk);
        DisplaySlider(imgDefHurt, txtDefHurt, info.DefHurt, data.maxDef);
        DisplaySlider(imgCureHP, txtCureHP, info.CureHP, data.maxCure);
        DisplaySlider(imgAtkHurt, txtAtkHurt, (ulong)info.AtkHurt, data.maxAtk);
        DisplaySlider(imgDefHurt, txtDefHurt, (ulong)info.DefHurt, data.maxDef);
        DisplaySlider(imgCureHP, txtCureHP, (ulong)info.CureHP, data.maxCure);
    }



 Main/System/BattleDetail/BattleDetailWin.cs

@@ -75,7 +75,7 @@
        for (int i = 0; i < infos.Count; i++)
        {
            BattleDetailHeroInfo nowInfo = infos[i];
            ulong nowValue = nowInfo.AtkHurt + nowInfo.DefHurt + nowInfo.CureHP;
            ulong nowValue = (ulong)nowInfo.AtkHurt + (ulong)nowInfo.DefHurt + (ulong)nowInfo.CureHP;
            if (nowValue > mvpScore)
            {
                mvpIndex = i;
@@ -96,12 +96,12 @@
        for (int i = 0; i < infos.Count; i++)
        {
            BattleDetailHeroInfo nowInfo = infos[i];
            if (nowInfo.AtkHurt > maxAtk)
                maxAtk = nowInfo.AtkHurt;
            if (nowInfo.DefHurt > maxDef)
                maxDef = nowInfo.DefHurt;
            if (nowInfo.CureHP > maxCure)
                maxCure = nowInfo.CureHP;
            if ((ulong)nowInfo.AtkHurt > maxAtk)
                maxAtk = (ulong)nowInfo.AtkHurt;
            if ((ulong)nowInfo.DefHurt > maxDef)
                maxDef = (ulong)nowInfo.DefHurt;
            if ((ulong)nowInfo.CureHP > maxCure)
                maxCure = (ulong)nowInfo.CureHP;
        }
    }
}

 Main/System/Equip/EquipExchangeCell.cs

@@ -95,12 +95,14 @@
            if (oldEquip == null)
            {
                decomposeObject.SetActive(false);
                decomposeButton.SetActive(false);
                exchangeButton.SetActive(false);
                putonButton.SetActive(true);
            }
            else
            {
                decomposeObject.SetActive(true);
                decomposeButton.SetActive(true);
                exchangeButton.SetActive(true);
                putonButton.SetActive(false);
            }

 Main/System/HappyXB/HeroCallResultWin.cs

@@ -48,6 +48,9 @@

    [SerializeField] Text callTip;

    //特权保底
    [SerializeField] Text openPrivilegeTip;

    public enum ResultState
    {
        single = 0, //单抽展示
@@ -87,17 +90,24 @@
        isSkip = LocalSave.GetBool(HeroUIManager.skipKey + PlayerDatas.Instance.baseData.PlayerID, false);
        HappyXBModel.Instance.RefreshXBResultAct += UpdateState;
        HappyXBModel.Instance.RefreshXBTypeInfoAct += RefreshBtn;
        InvestModel.Instance.onInvestUpdate += OnInvestUpdate;
        InitMoney();
        UpdateState();
        RefreshBtn();
        openPrivilegeTip.SetActive(!InvestModel.Instance.IsInvested(InvestModel.foreverCardType));
    }

    protected override void OnPreClose()
    {
        HappyXBModel.Instance.RefreshXBResultAct -= UpdateState;
        HappyXBModel.Instance.RefreshXBTypeInfoAct -= RefreshBtn;
        InvestModel.Instance.onInvestUpdate -= OnInvestUpdate;
    }

    void OnInvestUpdate(int type)
    {
        openPrivilegeTip.SetActive(!InvestModel.Instance.IsInvested(InvestModel.foreverCardType));
    }

    void UpdateState()
    {

 Main/System/HeroUI/HeroDeleteWin.cs

@@ -40,11 +40,11 @@

        HeroUIManager.Instance.SortHeroDeleteList();
        fiterManager.Display(0, SelectJobCountry);
        RefreshEmptyTip();

        //外部选中
        HeroUIManager.Instance.SelectDeleteHero(HeroManager.Instance.GetHero(HeroUIManager.Instance.jumpDeleteHeroGuid));

        RefreshEmptyTip();
        // CreateScroller();
    }

@@ -93,6 +93,7 @@
        {
            noHeroObj.SetActive(true);
            scroller.SetActive(false);
            HeroUIManager.Instance.selectDeleteHeroList.Clear();
        }
        else
        {

 Main/System/HeroUI/HeroHeadBaseNoTrainCell.cs

@@ -19,14 +19,14 @@
        }
    }

    Image m_QualityBG;
    Image qualityBG
    ImageEx m_QualityBG;
    ImageEx qualityBG
    {
        get
        {
            if (m_QualityBG == null)
            {
                m_QualityBG = this.transform.GetComponent<Image>("Container_HeadCell/qualityIcon");
                m_QualityBG = this.transform.GetComponent<ImageEx>("Container_HeadCell/qualityIcon");
            }
            return m_QualityBG;
        }
@@ -102,6 +102,7 @@
        var sprite = UILoader.LoadSprite("HeroHead", HeroSkinConfig.Get(heroConfig.SkinIDList[0]).SquareIcon);
        heroIcon.overrideSprite = sprite;
        heroIcon.gray = _gray;
        qualityBG.gray = _gray;

        countryImg.SetSprite(HeroUIManager.Instance.GetCountryIconName(heroConfig.Country));
        jobImg.SetSprite(HeroUIManager.Instance.GetJobIconName(heroConfig.Class));

 Main/System/Settlement/BattleSettlementManager.cs

@@ -395,9 +395,9 @@
    public int LV;      // 武将等级
    public int Star;      // 武将星级
    public int Skin;      // 武将皮肤ID
    public ulong DefHurt; // 总承伤
    public ulong CureHP;  // 总治疗
    public ulong AtkHurt; // 总输出
    public long DefHurt; // 总承伤
    public long CureHP;  // 总治疗
    public long AtkHurt; // 总输出
    public int Dead;      // 是否阵亡
}


 Main/System/Settlement/TianziBillboradVictoryWin.cs

@@ -22,6 +22,7 @@
    {
        base.OnPreOpen();
        isSweepVictory = TianziBillboradManager.Instance.isSweepVictory;
        detailBtn.SetActive(!isSweepVictory);
        scroller.OnRefreshCell += OnRefreshCell;
        CreateScroller();
        Display();