fix battlePreview problems
Merge branch 'master'
Fix Critical Message Repeat(in Port)
Merge branch 'master'