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

yyl

9 天以前 b1f98c42a6b859b35c26e0722efb38a6e9c215be

 Main/System/Main/PlayerMainDate.cs

@@ -18,7 +18,7 @@


    //--------------------用于战斗力滚动



    public long prowNum = 0;

    public long prowNum = 0;    //滚动前战力，最后一次战力

    public long prowNumChange = 0;

    public bool isAdd = true;//为true增加 为false减少

    private bool prowBool = true;

@@ -47,36 +47,21 @@
    }





    public void PowerAdd(ulong power)

    public void PowerAdd(long power)

    {

        if (prowBool)

        {

            prowNum = (long)power;

            prowNum = power;

            prowBool = false;

        }

        else

        {

            if ((long)power > prowNum)

            if (power != prowNum)

            {

                prowNumChange = (long)power - prowNum;

                prowNum = (long)power;

                isAdd = true;

                if (customDisplayPower != null && customDisplayPower())

                {

                    return;

                }

                if (UIManager.Instance.IsOpened<PowerAddWin>())

                {

                    AddPowerEvent?.Invoke();

                    return;

                }

                UIManager.Instance.OpenWindow<PowerAddWin>();

            }

            else if ((long)power < prowNum)

            {

                prowNumChange = prowNum - (long)power;

                prowNum = (long)power;

                isAdd = false;

                prowNumChange = power - prowNum;

                prowNum = power;

                isAdd = prowNumChange > 0;

                prowNumChange = Math.Abs(prowNumChange);

                if (customDisplayPower != null && customDisplayPower())

                {

                    return;

@@ -90,7 +75,7 @@
            }

            else

            {

                prowNum = (long)power;

                prowNum = power;

            }

        }

    }

@@ -108,7 +93,34 @@
    //     UIManager.Instance.OpenWindow<PowerAddWin>();

    // }



  
    /// <summary>

    /// 武将自身的战力变化

    /// </summary>

    /// <param name="hero"></param>

    public void AddPowerNotOnTeam(HeroInfo hero)

    {

        if (HeroUIManager.Instance.lastFightPower.Key != hero.itemHero.guid)

        {

            return;

        }



        if (hero.IsInTeamByTeamType(TeamType.Story))

        { 
            return;

        }



        prowNum = hero.CalculateFightPower();

        prowNumChange = prowNum - HeroUIManager.Instance.lastFightPower.Value;

        HeroUIManager.Instance.lastFightPower = new KeyValuePair<string, long>();

        isAdd = prowNumChange > 0;

        prowNumChange = Math.Abs(prowNumChange);

        if (UIManager.Instance.IsOpened<PowerAddWin>())

        {

            AddPowerEvent?.Invoke();

            return;

        }

        UIManager.Instance.OpenWindow<PowerAddWin>();

    }

}