Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-25 78bfe524ea4776c47f6314e56e97f39970b00fce

 System/PlayerDead/RebornWin.cs

@@ -79,7 +79,7 @@
        {

            questTimes = 0;

            _rebornPriceText.text = 1.ToString();

            if(DeadModel.isKillByPlayer || DeadModel.localBossState != 1)

            if(DeadModel.isKillByPlayer || !DeadModel.localBossState)

            {

                OnShowBtnlist();

            }