fix PreviewBattle
remove bool IsCombineCritical
Remove useless part
Merge branch 'master'