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

yyl

昨天 e2d4f9314a5097f961250b5e06b66660dc247312

 Main/System/Battle/BattleObject/BattleObject.cs

@@ -101,8 +101,15 @@
        var heroInfoBarScale = heroInfoBar.transform.localScale;
        heroInfoBarScale.x *= Camp == BattleCamp.Red ? 1 : -1;
        heroInfoBar.transform.localScale = heroInfoBarScale;

        heroInfoBar.SetActive(true);
        if (battleField is StoryBattleField && (battleField as StoryBattleField).battleState == StoryBattleState.Break)
        {
            //主线关卡休息中的不显示血条
            heroInfoBar.SetActive(false);
        }
        else
        {
            heroInfoBar.SetActive(true);
        }
        SetFront();
    }